Attachment #135119 for bug #179902




# $FreeBSD: sysutils/rsyslog7-devel/Makefile 319072 2013-05-25 20:10:11Z brd $

PORTNAME=	rsyslog
PORTVERSION=	7.5.2
CATEGORIES=	sysutils
MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/


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\.5
PORTDOCS=	*
PORTEXAMPLES=	*


Lines 1-2 Link Here

(-)rsyslog7-devel/distinfo (-2 / +2 lines)
1	SHA256 (rsyslog-7.3.15.tar.gz) = 8468c58ae28b713bfb19073fba7335644ea26e18aebcb5b83af679d3e5702cbd	1	SHA256 (rsyslog-7.5.2.tar.gz) = 49be28fc5582248eb07472cee204732d2a7e50ae70c4544ef516c1f644a91200
2	SIZE (rsyslog-7.3.15.tar.gz) = 2920543	2	SIZE (rsyslog-7.5.2.tar.gz) = 2931737

Lines 1-10 Link Here

(-)rsyslog7-devel/files/patch-plugins--impstats--impstats.c (-10 lines)
1	--- plugins/impstats/impstats.c.ori 2013-05-24 20:36:41.000000000 -0600
2	+++ plugins/impstats/impstats.c 2013-05-24 20:36:56.000000000 -0600
3	@@ -39,6 +39,7 @@
4	#include "glbl.h"
5	#include "statsobj.h"
6	#include "prop.h"
7	+#include <sys/stat.h>
8
9	MODULE_TYPE_INPUT
10	MODULE_TYPE_NOKEEP

Lines 1-11 Link Here

(-)rsyslog7-devel/files/patch-runtime--cryprov.h (-11 lines)
1	--- runtime/cryprov.h.ori 2013-05-24 19:47:48.000000000 -0600
2	+++ runtime/cryprov.h 2013-05-24 20:20:40.000000000 -0600
3	@@ -33,7 +33,7 @@
4	rsRetVal (Destruct)(void ppThis);
5	rsRetVal (OnFileOpen)(void pThis, uchar fn, void pFileInstData);
6	rsRetVal (Encrypt)(void pFileInstData, uchar buf, size_t lenBuf);
7	- rsRetVal (OnFileClose)(void pFileInstData, off64_t offsLogfile);
8	+ rsRetVal (OnFileClose)(void pFileInstData, off_t offsLogfile);
9	ENDinterface(cryprov)
10	#define cryprovCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
11	#endif /* #ifndef INCLUDED_CRYPROV_H */




--- 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)

Lines 1-11 Link Here

(-)rsyslog7-devel/files/patch-runtime--libgcry.h (-11 lines)
1	--- runtime/libgcry.h.ori 2013-05-24 20:23:45.000000000 -0600
2	+++ runtime/libgcry.h 2013-05-24 20:24:03.000000000 -0600
3	@@ -49,7 +49,7 @@
4	rsRetVal rsgcrySetAlgo(gcryctx ctx, uchar *modename);
5	gcryctx gcryCtxNew(void);
6	void rsgcryCtxDel(gcryctx ctx);
7	-int gcryfileDestruct(gcryfile gf, off64_t offsLogfile);
8	+int gcryfileDestruct(gcryfile gf, off_t offsLogfile);
9	rsRetVal rsgcryInitCrypt(gcryctx ctx, gcryfile pgf, uchar fname);
10	int rsgcryEncrypt(gcryfile pF, uchar buf, size_t len);
11

Lines 1-11 Link Here

(-)rsyslog7-devel/files/patch-runtime--lmcry_gcry.c (-11 lines)
1	--- runtime/lmcry_gcry.c.ori 2013-05-24 20:25:10.000000000 -0600
2	+++ runtime/lmcry_gcry.c 2013-05-24 20:25:25.000000000 -0600
3	@@ -216,7 +216,7 @@
4	}
5
6	static rsRetVal
7	-OnFileClose(void *pF, off64_t offsLogfile)
8	+OnFileClose(void *pF, off_t offsLogfile)
9	{
10	DEFiRet;
11	gcryfileDestruct(pF, offsLogfile);

Lines 1-11 Link Here

(-)rsyslog7-devel/files/patch-runtime--queue.c (-11 lines)
1	--- runtime/queue.c.ori 2013-05-24 20:22:54.000000000 -0600
2	+++ runtime/queue.c 2013-05-24 20:23:07.000000000 -0600
3	@@ -1449,7 +1449,7 @@
4	DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem)
5	{
6	int i;
7	- off64_t bytesDel;
8	+ off_t bytesDel;
9	DEFiRet;
10
11	ISOBJ_TYPE_assert(pThis, qqueue);

Lines 1-10 Link Here

(-)rsyslog7-devel/files/patch-runtime--stream.h (-10 lines)
1	--- runtime/stream.h.ori 2013-05-24 20:21:51.000000000 -0600
2	+++ runtime/stream.h 2013-05-24 20:21:11.000000000 -0600
3	@@ -207,6 +207,6 @@
4
5	/* prototypes */
6	PROTOTYPEObjClassInit(strm);
7	-rsRetVal strmMultiFileSeek(strm_t pThis, int fileNum, off64_t offs, off64_t bytesDel);
8	+rsRetVal strmMultiFileSeek(strm_t pThis, int fileNum, off_t offs, off_t bytesDel);
9
10	#endif /* #ifndef STREAM_H_INCLUDED */

Return to bug 179902

Lines 1-7 Link Here

(-)rsyslog7-devel/Makefile (-3 / +2 lines)
1	# $FreeBSD: sysutils/rsyslog7-devel/Makefile 319072 2013-05-25 20:10:11Z brd $	1	# $FreeBSD: sysutils/rsyslog7-devel/Makefile 319072 2013-05-25 20:10:11Z brd $
2		2
3	PORTNAME= rsyslog	3	PORTNAME= rsyslog
4	PORTVERSION= 7.3.15	4	PORTVERSION= 7.5.2
5	CATEGORIES= sysutils	5	CATEGORIES= sysutils
6	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/	6	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
7		7
Lines 14-26 Link Here
14	LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \	14	LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \
15	estr:${PORTSDIR}/devel/libestr \	15	estr:${PORTSDIR}/devel/libestr \
16	json.0:${PORTSDIR}/devel/json-c \	16	json.0:${PORTSDIR}/devel/json-c \
17	sysinfo:${PORTSDIR}/devel/libsysinfo \
18	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid	17	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
19		18
20	BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \	19	BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \
21	rst2man:${PORTSDIR}/textproc/py-docutils	20	rst2man:${PORTSDIR}/textproc/py-docutils
22		21
23	PORTSCOUT= limit:^7\.3	22	PORTSCOUT= limit:^7\.5
24	PORTDOCS= *	23	PORTDOCS= *
25	PORTEXAMPLES= *	24	PORTEXAMPLES= *
26		25

Lines 1-20 Link Here

(-)rsyslog7-devel/files/patch-runtime--libgcry.c (-20 lines)
1	--- runtime/libgcry.c.ori 2013-05-24 20:24:27.000000000 -0600
2	+++ runtime/libgcry.c 2013-05-24 20:24:52.000000000 -0600
3	@@ -171,7 +171,7 @@
4	* no matter what happens.
5	*/
6	static void
7	-eiClose(gcryfile gf, off64_t offsLogfile)
8	+eiClose(gcryfile gf, off_t offsLogfile)
9	{
10	char offs[21];
11	size_t len;
12	@@ -213,7 +213,7 @@
13	}
14
15	int
16	-gcryfileDestruct(gcryfile gf, off64_t offsLogfile)
17	+gcryfileDestruct(gcryfile gf, off_t offsLogfile)
18	{
19	int r = 0;
20	if(gf == NULL)