Attachment 135118 Details for Bug 179902 – patch-rsyslog7-devel-7.5.1.txt

[patch] patch-rsyslog7-devel-7.5.1.txt

patch-rsyslog7-devel-7.5.1.txt (text/plain), 6.29 KB, created by cristianorolim on 2013-06-27 00:58:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cristianorolim

Created: 2013-06-27 00:58:32 UTC

Size: 6.29 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-26 21:32:53.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.1
> 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-26 21:35:34.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.1.tar.gz) = 3f97ce6556e5dec4b4881d6d2e591f502a60e68ea91021c15050c6e1ce3cfadc
>+SIZE (rsyslog-7.5.1.tar.gz) = 2930842
>diff -ruN rsyslog7-devel.orig/files/patch-plugins--impstats--impstats.c rsyslog7-devel/files/patch-plugins--impstats--impstats.c
>--- rsyslog7-devel.orig/files/patch-plugins--impstats--impstats.c	2013-06-23 19:01:23.000000000 -0300
>+++ rsyslog7-devel/files/patch-plugins--impstats--impstats.c	1969-12-31 21:00:00.000000000 -0300
>@@ -1,10 +0,0 @@
>---- plugins/impstats/impstats.c.ori	2013-05-24 20:36:41.000000000 -0600
>-+++ plugins/impstats/impstats.c	2013-05-24 20:36:56.000000000 -0600
>-@@ -39,6 +39,7 @@
>- #include "glbl.h"
>- #include "statsobj.h"
>- #include "prop.h"
>-+#include <sys/stat.h>
>- 
>- MODULE_TYPE_INPUT
>- MODULE_TYPE_NOKEEP
>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	1969-12-31 21:00:00.000000000 -0300
>@@ -1,11 +0,0 @@
>---- 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 */
>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--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.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