diff --git a/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch b/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch deleted file mode 100644 index b4ff801f0f7..00000000000 --- a/srcpkgs/rsyslog/patches/runtime_missing_symbols.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- runtime/Makefile.am.orig 2012-01-14 10:20:51.235371487 +0100 -+++ runtime/Makefile.am 2012-01-14 10:22:02.857662520 +0100 -@@ -115,7 +115,7 @@ else - librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) - endif - #librsyslog_la_LDFLAGS = -module -avoid-version --librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) -+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBESTR_LIBS) $(LIBEE_LIBS) - - # - # regular expression support -@@ -125,7 +125,7 @@ pkglib_LTLIBRARIES += lmregexp.la - lmregexp_la_SOURCES = regexp.c regexp.h - lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmregexp_la_LDFLAGS = -module -avoid-version --lmregexp_la_LIBADD = -+lmregexp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) - endif - - # -@@ -136,7 +136,7 @@ pkglib_LTLIBRARIES += lmzlibw.la - lmzlibw_la_SOURCES = zlibw.c zlibw.h - lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmzlibw_la_LDFLAGS = -module -avoid-version --lmzlibw_la_LIBADD = -+lmzlibw_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) $(ZLIB_LIBS) - endif - - if ENABLE_INET -@@ -147,7 +147,7 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrm - lmnet_la_SOURCES = net.c net.h - lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmnet_la_LDFLAGS = -module -avoid-version --lmnet_la_LIBADD = -+lmnet_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) - - # network stream master class and stream factory - lmnetstrms_la_SOURCES = netstrms.c netstrms.h \ -@@ -156,14 +156,14 @@ lmnetstrms_la_SOURCES = netstrms.c netst - nspoll.c nspoll.h - lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmnetstrms_la_LDFLAGS = -module -avoid-version --lmnetstrms_la_LIBADD = -+lmnetstrms_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) - - # generic stream server framework - pkglib_LTLIBRARIES += lmstrmsrv.la - lmstrmsrv_la_SOURCES = strmsrv.c strmsrv.h strms_sess.c strms_sess.h - lmstrmsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmstrmsrv_la_LDFLAGS = -module -avoid-version --lmstrmsrv_la_LIBADD = -+lmstrmsrv_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) - - # netstream drivers - -@@ -174,7 +174,7 @@ lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_p - nsdpoll_ptcp.c nsdpoll_ptcp.h - lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - lmnsd_ptcp_la_LDFLAGS = -module -avoid-version --lmnsd_ptcp_la_LIBADD = -+lmnsd_ptcp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) - endif # if ENABLE_INET - - # -@@ -185,7 +185,7 @@ pkglib_LTLIBRARIES += lmnsd_gtls.la - lmnsd_gtls_la_SOURCES = nsd_gtls.c nsd_gtls.h nsdsel_gtls.c nsdsel_gtls.h - lmnsd_gtls_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(GNUTLS_CFLAGS) - lmnsd_gtls_la_LDFLAGS = -module -avoid-version --lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS) -+lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) - endif - - update-systemd: diff --git a/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs index f34d857590d..ba423618de0 100644 --- a/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs +++ b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs @@ -1,7 +1,2 @@ libgnutls.so.26 libc.so.6 -libpthread.so.0 -libdl.so.2 -librt.so.1 -libestr.so.0 -libee.so.0 diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 4c25f247fa6..32a69e02bff 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=6.2.0 -revision=2 +version=6.2.2 +revision=1 build_style=gnu-configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5 @@ -10,15 +10,14 @@ configure_args="--enable-gnutls --enable-mysql --enable-pgsql --enable-impstats --enable-omprog --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom --enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock ---enable-smcustbindcdr --enable-imtemplate --enable-omtemplate -LDFLAGS=-Wl,--allow-shlib-undefined" -makedepends="automake pkg-config zlib-devel gnutls-devel postgresql-libs-devel libmysqlclient-devel mit-krb5-devel libee-devel" +--enable-imtemplate --enable-omtemplate" +makedepends="pkg-config gnutls-devel postgresql-libs-devel libmysqlclient-devel mit-krb5-devel libee-devel" short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=f8869a1c25d0dd9ff04468743969ffc9ff89c6f7afa3046f77f91c3982543cc1 +checksum=c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471 long_desc=" Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists, @@ -30,10 +29,9 @@ systemd_services="rsyslog.service on" provides="syslog-daemon-0" replaces="syslog-daemon>=0" make_dirs="/etc/rsyslog.d 0755 root root" -disable_parallel_build=yes -pre_configure() { - autoreconf -fi +post_configure() { + echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile } post_install() {