Attachment 135117 Details for Bug 179902 – file.diff

[patch] file.diff

file.diff (text/plain), 7.99 KB, created by cristianorolim on 2013-06-24 01:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cristianorolim

Created: 2013-06-24 01:30:00 UTC

Size: 7.99 KB

patch

obsolete

>diff -ruN rsyslog7-devel.orig/Makefile rsyslog7-devel/Makefile
>--- rsyslog7-devel.orig/Makefile	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/Makefile	2013-06-23 21:59:03.000000000 -0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: sysutils/rsyslog7-devel/Makefile 319072 2013-05-25 20:10:11Z brd $
> 
> PORTNAME=	rsyslog
>-PORTVERSION=	7.3.15
>+PORTVERSION=	7.5.0
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
> 
>@@ -14,13 +14,12 @@
> LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
> 		estr:${PORTSDIR}/devel/libestr \
> 		json.0:${PORTSDIR}/devel/json-c \
>-		sysinfo:${PORTSDIR}/devel/libsysinfo \
> 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
> 
> BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
> 		rst2man:${PORTSDIR}/textproc/py-docutils
> 
>-PORTSCOUT=	limit:^7\.3
>+PORTSCOUT=	limit:^7\.5
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>diff -ruN rsyslog7-devel.orig/distinfo rsyslog7-devel/distinfo
>--- rsyslog7-devel.orig/distinfo	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/distinfo	2013-06-23 19:07:59.000000000 -0300
>@@ -1,2 +1,2 @@
>-SHA256 (rsyslog-7.3.15.tar.gz) = 8468c58ae28b713bfb19073fba7335644ea26e18aebcb5b83af679d3e5702cbd
>-SIZE (rsyslog-7.3.15.tar.gz) = 2920543
>+SHA256 (rsyslog-7.5.0.tar.gz) = 892c22889bde173ca6fcdf254e3399f29428aba37641b02d1355c70ddf63de96
>+SIZE (rsyslog-7.5.0.tar.gz) = 2915848
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--cryprov.h rsyslog7-devel/files/patch-runtime--cryprov.h
>--- rsyslog7-devel.orig/files/patch-runtime--cryprov.h	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--cryprov.h	2013-06-23 22:02:02.000000000 -0300
>@@ -1,11 +1,11 @@
>---- runtime/cryprov.h.ori	2013-05-24 19:47:48.000000000 -0600
>-+++ runtime/cryprov.h	2013-05-24 20:20:40.000000000 -0600
>-@@ -33,7 +33,7 @@
>- 	rsRetVal (*Destruct)(void *ppThis);
>- 	rsRetVal (*OnFileOpen)(void *pThis, uchar *fn, void *pFileInstData);
>- 	rsRetVal (*Encrypt)(void *pFileInstData, uchar *buf, size_t *lenBuf);
>--	rsRetVal (*OnFileClose)(void *pFileInstData, off64_t offsLogfile);
>-+	rsRetVal (*OnFileClose)(void *pFileInstData, off_t offsLogfile);
>- ENDinterface(cryprov)
>- #define cryprovCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
>- #endif /* #ifndef INCLUDED_CRYPROV_H */
>+--- runtime/cryprov.h.orig	2013-06-10 12:46:01.000000000 -0300
>++++ runtime/cryprov.h	2013-06-23 22:01:21.000000000 -0300
>+@@ -33,6 +33,8 @@
>+ #define CRYPROV_PARAMTYPE_REGULAR 0
>+ #define CRYPROV_PARAMTYPE_DISK 1
>+ 
>++typedef off_t off64_t;
>++
>+ /* interface */
>+ BEGINinterface(cryprov) /* name must also be changed in ENDinterface macro! */
>+ 	rsRetVal (*Construct)(void *ppThis);
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--libgcry.c rsyslog7-devel/files/patch-runtime--libgcry.c
>--- rsyslog7-devel.orig/files/patch-runtime--libgcry.c	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--libgcry.c	1969-12-31 21:00:00.000000000 -0300
>@@ -1,20 +0,0 @@
>---- runtime/libgcry.c.ori	2013-05-24 20:24:27.000000000 -0600
>-+++ runtime/libgcry.c	2013-05-24 20:24:52.000000000 -0600
>-@@ -171,7 +171,7 @@
>-  * no matter what happens.
>-  */
>- static void
>--eiClose(gcryfile gf, off64_t offsLogfile)
>-+eiClose(gcryfile gf, off_t offsLogfile)
>- {
>- 	char offs[21];
>- 	size_t len;
>-@@ -213,7 +213,7 @@
>- }
>- 
>- int
>--gcryfileDestruct(gcryfile gf, off64_t offsLogfile)
>-+gcryfileDestruct(gcryfile gf, off_t offsLogfile)
>- {
>- 	int r = 0;
>- 	if(gf == NULL)
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--libgcry.h rsyslog7-devel/files/patch-runtime--libgcry.h
>--- rsyslog7-devel.orig/files/patch-runtime--libgcry.h	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--libgcry.h	1969-12-31 21:00:00.000000000 -0300
>@@ -1,11 +0,0 @@
>---- runtime/libgcry.h.ori	2013-05-24 20:23:45.000000000 -0600
>-+++ runtime/libgcry.h	2013-05-24 20:24:03.000000000 -0600
>-@@ -49,7 +49,7 @@
>- rsRetVal rsgcrySetAlgo(gcryctx ctx, uchar *modename);
>- gcryctx gcryCtxNew(void);
>- void rsgcryCtxDel(gcryctx ctx);
>--int gcryfileDestruct(gcryfile gf, off64_t offsLogfile);
>-+int gcryfileDestruct(gcryfile gf, off_t offsLogfile);
>- rsRetVal rsgcryInitCrypt(gcryctx ctx, gcryfile *pgf, uchar *fname);
>- int rsgcryEncrypt(gcryfile pF, uchar *buf, size_t *len);
>- 
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--lmcry_gcry.c rsyslog7-devel/files/patch-runtime--lmcry_gcry.c
>--- rsyslog7-devel.orig/files/patch-runtime--lmcry_gcry.c	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--lmcry_gcry.c	1969-12-31 21:00:00.000000000 -0300
>@@ -1,11 +0,0 @@
>---- runtime/lmcry_gcry.c.ori	2013-05-24 20:25:10.000000000 -0600
>-+++ runtime/lmcry_gcry.c	2013-05-24 20:25:25.000000000 -0600
>-@@ -216,7 +216,7 @@
>- }
>- 
>- static rsRetVal
>--OnFileClose(void *pF, off64_t offsLogfile)
>-+OnFileClose(void *pF, off_t offsLogfile)
>- {
>- 	DEFiRet;
>- 	gcryfileDestruct(pF, offsLogfile);
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--msg.c rsyslog7-devel/files/patch-runtime--msg.c
>--- rsyslog7-devel.orig/files/patch-runtime--msg.c	1969-12-31 21:00:00.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--msg.c	2013-06-23 22:05:17.000000000 -0300
>@@ -0,0 +1,35 @@
>+--- runtime/msg.c.orig	2013-06-23 20:19:15.000000000 -0300
>++++ runtime/msg.c	2013-06-23 20:38:38.000000000 -0300
>+@@ -2988,29 +2988,16 @@
>+ 			*pbMustBeFreed = 0;
>+ 			break;
>+ 		case PROP_SYS_UPTIME:
>+-#			ifndef HAVE_SYSINFO_UPTIME
>+-            /* An alternative on some systems (eg Solaris) is to scan
>+-             * /var/adm/utmpx for last boot time.
>+-             */
>+-			pRes = (uchar*) "UPTIME NOT available on this system";
>+-			*pbMustBeFreed = 0;
>+-#			else
>+ 			{
>+-			struct sysinfo s_info;
>+-
>+-			if((pRes = (uchar*) MALLOC(sizeof(uchar) * 32)) == NULL) {
>+-				RET_OUT_OF_MEMORY;
>+-			}
>+-			*pbMustBeFreed = 1;
>++			struct timespec tp;
>+ 
>+-			if(sysinfo(&s_info) < 0) {
>++			if (clock_gettime(CLOCK_UPTIME, &tp) == -1) {
>+ 				*pPropLen = sizeof("**SYSCALL FAILED**") - 1;
>+ 				return(UCHAR_CONSTANT("**SYSCALL FAILED**"));
>+ 			}
>+ 
>+-			snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", s_info.uptime);
>++			snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", tp.tv_sec);
>+ 			}
>+-#			endif
>+ 		break;
>+ 		default:
>+ 			/* there is no point in continuing, we may even otherwise render the
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--queue.c rsyslog7-devel/files/patch-runtime--queue.c
>--- rsyslog7-devel.orig/files/patch-runtime--queue.c	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--queue.c	1969-12-31 21:00:00.000000000 -0300
>@@ -1,11 +0,0 @@
>---- runtime/queue.c.ori	2013-05-24 20:22:54.000000000 -0600
>-+++ runtime/queue.c	2013-05-24 20:23:07.000000000 -0600
>-@@ -1449,7 +1449,7 @@
>- DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem)
>- {
>- 	int i;
>--	off64_t bytesDel;
>-+	off_t bytesDel;
>- 	DEFiRet;
>- 
>- 	ISOBJ_TYPE_assert(pThis, qqueue);
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--stream.c rsyslog7-devel/files/patch-runtime--stream.c
>--- rsyslog7-devel.orig/files/patch-runtime--stream.c	1969-12-31 21:00:00.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--stream.c	2013-06-23 22:02:50.000000000 -0300
>@@ -0,0 +1,10 @@
>+--- runtime/stream.c.orig	2013-06-23 20:16:13.000000000 -0300
>++++ runtime/stream.c	2013-06-23 20:16:54.000000000 -0300
>+@@ -67,7 +67,6 @@
>+ #  define O_LARGEFILE 0
>+ #endif
>+ #ifndef HAVE_LSEEK64
>+-   typedef  off_t off64_t;
>+ #  define lseek64(fd, offset, whence) lseek(fd, offset, whence)
>+ #endif
>+ 
>diff -ruN rsyslog7-devel.orig/files/patch-runtime--stream.h rsyslog7-devel/files/patch-runtime--stream.h
>--- rsyslog7-devel.orig/files/patch-runtime--stream.h	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-runtime--stream.h	1969-12-31 21:00:00.000000000 -0300
>@@ -1,10 +0,0 @@
>---- runtime/stream.h.ori	2013-05-24 20:21:51.000000000 -0600
>-+++ runtime/stream.h	2013-05-24 20:21:11.000000000 -0600
>-@@ -207,6 +207,6 @@
>- 
>- /* prototypes */
>- PROTOTYPEObjClassInit(strm);
>--rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off64_t offs, off64_t *bytesDel);
>-+rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off_t offs, off_t *bytesDel);
>- 
>- #endif /* #ifndef STREAM_H_INCLUDED */

Actions: View | Diff

Attachments on bug 179902: 135117 | 135118 | 135119