svn commit: r345312 - in head/sysutils: rsyslog7 rsyslog7-devel rsyslog8-devel

Sat Feb 22 05:01:43 UTC 2014

On 2/20/2014 8:28 PM, Brad Davis wrote:
> Author: brd (doc committer)
> Date: Fri Feb 21 02:28:22 2014
> New Revision: 345312
> URL: http://svnweb.freebsd.org/changeset/ports/345312
> QAT: https://qat.redports.org/buildarchive/r345312/
> 
> Log:
>   - Upgrade sysutils/rsyslog7 to 7.6.0, sysutils/rsyslog7-devel to 7.5.8 [1], and sysutils/rsyslog8-devel to 8.1.6.
>   
>   1: I know it is lower than rsyslog7, but it is the latest from upstream. They say that a newer release is imminent.
>   
>   Changelogs:
>   	7.6.0: http://www.rsyslog.com/changelog-for-7-6-0-v7-stable/
>   	7.5.8: http://www.rsyslog.com/changelog-for-7-5-8-v7-devel/
>   	8.1.6: http://www.rsyslog.com/changelog-for-8-1-6-v8-devel/
>   
>   Reviewed by:	miwi@
> 
> Modified:
>   head/sysutils/rsyslog7-devel/Makefile
>   head/sysutils/rsyslog7-devel/distinfo
>   head/sysutils/rsyslog7-devel/pkg-plist
>   head/sysutils/rsyslog7/Makefile
>   head/sysutils/rsyslog7/distinfo
>   head/sysutils/rsyslog8-devel/Makefile
>   head/sysutils/rsyslog8-devel/distinfo
>   head/sysutils/rsyslog8-devel/pkg-plist
> 
> Modified: head/sysutils/rsyslog7-devel/Makefile
> ==============================================================================
> --- head/sysutils/rsyslog7-devel/Makefile	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog7-devel/Makefile	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,7 +1,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	rsyslog
> -PORTVERSION=	7.5.7
> +PORTVERSION=	7.5.8
>  CATEGORIES=	sysutils
>  MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
>  
> @@ -161,5 +161,8 @@ post-install:
>  	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
>  	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
>  	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
> +.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail omruleset
> +	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
> +.endfor
>  
>  .include <bsd.port.post.mk>
> 
> Modified: head/sysutils/rsyslog7-devel/distinfo
> ==============================================================================
> --- head/sysutils/rsyslog7-devel/distinfo	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog7-devel/distinfo	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-7.5.7.tar.gz) = 0bc21d20e5b3460554d7c60d347f3207153c52c68b6b870bfa7f27163c24682a
> -SIZE (rsyslog-7.5.7.tar.gz) = 2592596
> +SHA256 (rsyslog-7.5.8.tar.gz) = 38a8b5be53feaae9225e46f2c93d7cc87954ead58ac9526ffc63de71f3d4a542
> +SIZE (rsyslog-7.5.8.tar.gz) = 2595061
> 
> Modified: head/sysutils/rsyslog7-devel/pkg-plist
> ==============================================================================
> --- head/sysutils/rsyslog7-devel/pkg-plist	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog7-devel/pkg-plist	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -40,5 +40,7 @@ lib/rsyslog/omstdout.la
>  lib/rsyslog/omstdout.so
>  lib/rsyslog/omtesting.la
>  lib/rsyslog/omtesting.so
> +man/man5/rsyslog.conf.5.gz
> +man/man8/rsyslogd.8.gz
>  sbin/rsyslogd
>  @dirrmtry lib/rsyslog
> 
> Modified: head/sysutils/rsyslog7/Makefile
> ==============================================================================
> --- head/sysutils/rsyslog7/Makefile	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog7/Makefile	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,7 +1,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	rsyslog
> -PORTVERSION=	7.4.7
> +PORTVERSION=	7.6.0
>  CATEGORIES=	sysutils
>  MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
>  
> @@ -12,7 +12,8 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
>  
>  LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
>  		libestr.so:${PORTSDIR}/devel/libestr \
> -		libjson.so:${PORTSDIR}/devel/json-c
> +		libjson.so:${PORTSDIR}/devel/json-c \
> +		liblogging-stdlog.so:${PORTSDIR}/devel/liblogging
>  
>  USE_LDCONFIG=	yes
>  USE_AUTOTOOLS=	autoconf
> @@ -163,8 +164,11 @@ post-patch:
>  post-install:
>  	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
>  	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
> -	@${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${STAGEDIR}${DOCSDIR}/
> +	@${INSTALL_DATA} ${WRKSRC}/doc/*png ${STAGEDIR}${DOCSDIR}/
>  	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
>  	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
> +.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail omruleset
> +	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
> +.endfor
>  
>  .include <bsd.port.post.mk>
> 
> Modified: head/sysutils/rsyslog7/distinfo
> ==============================================================================
> --- head/sysutils/rsyslog7/distinfo	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog7/distinfo	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-7.4.7.tar.gz) = 5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21
> -SIZE (rsyslog-7.4.7.tar.gz) = 2934197
> +SHA256 (rsyslog-7.6.0.tar.gz) = c40da756369dbb560b26f5baab5bdbdf25f728c74c32e9ae28a1888f376020a0
> +SIZE (rsyslog-7.6.0.tar.gz) = 2601253
> 
> Modified: head/sysutils/rsyslog8-devel/Makefile
> ==============================================================================
> --- head/sysutils/rsyslog8-devel/Makefile	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog8-devel/Makefile	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,7 +1,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	rsyslog
> -PORTVERSION=	8.1.3
> +PORTVERSION=	8.1.6
>  CATEGORIES=	sysutils
>  MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
>  
> @@ -13,6 +13,7 @@ BUILD_DEPENDS=	libgcrypt-config:${PORTSD
>  LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
>  		libestr.so:${PORTSDIR}/devel/libestr \
>  		libjson.so:${PORTSDIR}/devel/json-c \
> +		liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
>  		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
>  
>  USE_LDCONFIG=	yes
> @@ -161,5 +162,8 @@ post-install:
>  	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
>  	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
>  	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
> +.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail
> +	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
> +.endfor
>  
>  .include <bsd.port.post.mk>
> 
> Modified: head/sysutils/rsyslog8-devel/distinfo
> ==============================================================================
> --- head/sysutils/rsyslog8-devel/distinfo	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog8-devel/distinfo	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-8.1.3.tar.gz) = e2e5e12500b6d2a8be80558b2f71da6408a1fc9889eb22c74fba819aaf4bcd45
> -SIZE (rsyslog-8.1.3.tar.gz) = 2608152
> +SHA256 (rsyslog-8.1.6.tar.gz) = 7505609b461813e5fea1168d386e4d07e3678c923c2b449684e95d07b6b71849
> +SIZE (rsyslog-8.1.6.tar.gz) = 2633711
> 
> Modified: head/sysutils/rsyslog8-devel/pkg-plist
> ==============================================================================
> --- head/sysutils/rsyslog8-devel/pkg-plist	Fri Feb 21 02:00:57 2014	(r345311)
> +++ head/sysutils/rsyslog8-devel/pkg-plist	Fri Feb 21 02:28:22 2014	(r345312)
> @@ -38,5 +38,7 @@ lib/rsyslog/omstdout.la
>  lib/rsyslog/omstdout.so
>  lib/rsyslog/omtesting.la
>  lib/rsyslog/omtesting.so
> +man/man5/rsyslog.conf.5.gz
> +man/man8/rsyslogd.8.gz
>  sbin/rsyslogd
>  @dirrmtry lib/rsyslog
> 

The devel/liblogging update breaks these ports with RFC3195 option. It
is looking for liblogging.so (which does not exist as it is
liblogging-stdlog.so now).

There's 2 problems:

1. The LIB_DEPENDS is looking for a file it will never find which breaks
package building with the RFC3195 option enabled:

> ===>   rsyslog-7.6.0 depends on shared library: liblogging-stdlog.so - not found
> ===>    Verifying for liblogging-stdlog.so in /usr/ports/devel/liblogging
> ===>   Installing existing package /packages/All/liblogging-1.0.1.txz
> Installing liblogging-1.0.1... done
[snip]
> ===>   Returning to build of rsyslog-7.6.0
> ===>   rsyslog-7.6.0 depends on shared library: liblogging.so - not found
> ===>    Verifying for liblogging.so in /usr/ports/devel/liblogging
> ===>   Installing existing package /packages/All/liblogging-1.0.1.txz
> Installing liblogging-1.0.1...liblogging-1.0.1 already installed
> 
> Failed to install the following 1 package(s): /packages/All/liblogging-1.0.1.txz
> *** Error code 70

2. Removing that does not fix the build:

> checking for LIBLOGGING... no
> configure: error: Package requirements (liblogging >= 0.7.1) were not met:
> 
> Package liblogging was not found in the pkg-config search path.
> Perhaps you should add the directory containing `liblogging.pc'
> to the PKG_CONFIG_PATH environment variable
> Package 'liblogging', required by 'world', not found

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 553 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140221/548870a1/attachment.sig>