Revision: 7575
http://sourceforge.net/p/ipcop/svn/7575
Author: owes
Date: 2014-05-24 08:43:14 +0000 (Sat, 24 May 2014)
Log Message:
-----------
Update rsyslog to 7.6.3
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/rsyslog
ipcop/trunk/lfs/rsyslog
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
ipcop/trunk/updates/2.1.6/setup
Modified: ipcop/trunk/config/rootfiles/common/rsyslog
===================================================================
--- ipcop/trunk/config/rootfiles/common/rsyslog 2014-05-24 08:32:10 UTC (rev
7574)
+++ ipcop/trunk/config/rootfiles/common/rsyslog 2014-05-24 08:43:14 UTC (rev
7575)
@@ -1,3 +1,17 @@
+#usr/bin/stdlogctl
+#usr/include/libestr.h
+#usr/include/liblogging
+#usr/include/liblogging/stdlog.h
+#usr/lib/libestr.la
+#usr/lib/libestr.so
+usr/lib/libestr.so.0
+usr/lib/libestr.so.0.0.0
+#usr/lib/liblogging-stdlog.la
+#usr/lib/liblogging-stdlog.so
+usr/lib/liblogging-stdlog.so.0
+usr/lib/liblogging-stdlog.so.0.0.0
+#usr/lib/pkgconfig/libestr.pc
+#usr/lib/pkgconfig/liblogging-stdlog.pc
#usr/lib/rsyslog
#usr/lib/rsyslog/imklog.la
usr/lib/rsyslog/imklog.so
Modified: ipcop/trunk/lfs/rsyslog
===================================================================
--- ipcop/trunk/lfs/rsyslog 2014-05-24 08:32:10 UTC (rev 7574)
+++ ipcop/trunk/lfs/rsyslog 2014-05-24 08:43:14 UTC (rev 7575)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = rsyslog
-VER = 5.10.1
+VER = 7.6.3
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,15 +43,24 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+APP_ESTR = libestr-0.1.9
+DL_ESTR = $(APP_ESTR).tar.gz
+APP_LOGGING = liblogging-1.0.4
+DL_LOGGING = $(APP_LOGGING).tar.gz
+
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(DL_ESTR) $(DL_LOGGING)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_ESTR) = http://libestr.adiscon.com/files/download/$(DL_ESTR)
+$(DL_LOGGING) = http://download.rsyslog.com/liblogging/$(DL_LOGGING)
-$(DL_FILE)_MD5 = a28c99e05888c977672db6e254694208
+$(DL_FILE)_MD5 = 09c29847fff170bece92975f1bb05caa
+$(DL_ESTR)_MD5 = 681ca0ed7e5ae6ddff70fdec413096e4
+$(DL_LOGGING)_MD5 = 034083ef1424a566fdeefc56a719691f
install : $(TARGET)
@@ -83,18 +92,30 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)-5.8.9_stack-size.patch
+ cd $(DIR_APP) && mkdir _deps
+
+ cd $(DIR_APP)/_deps && tar xf $(DIR_DL)/$(DL_ESTR)
+ cd $(DIR_APP)/_deps/$(APP_ESTR) && ./configure --disable-static
--prefix=/usr
+ cd $(DIR_APP)/_deps/$(APP_ESTR) && make && make install
+
+ cd $(DIR_APP)/_deps && tar xf $(DIR_DL)/$(DL_LOGGING)
+ cd $(DIR_APP)/_deps/$(APP_LOGGING) && ./configure --disable-man-pages
--disable-journal --disable-static --prefix=/usr
+ cd $(DIR_APP)/_deps/$(APP_LOGGING) && make && make install
+
# 'checking for library containing clock_gettime' is required to find
the lib to link and set RT_LIBS
# 'checking for clock_gettime...' is badly made and unneeded as nothing
is under HAVE_CLOCK_GETTIME define.
# Code use _POSIX_TIMERS defined in /usr/include/bits/posix_opt.h.
Remove the unneeded part.
cd $(DIR_APP) && sed -i 's/alarm clock_gettime/alarm/' configure
- cd $(DIR_APP) && ./configure --prefix=/usr \
+ cd $(DIR_APP) && ./configure --prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
- --localstatedir=/var
+ --localstatedir=/var \
+ --enable-regexp \
+ --disable-libgcrypt
# Disable strict-aliasing on only the required files
# Probably a gcc-4.4 issue as more recent compiler does not warn on
debian/fedora build log
- cd $(DIR_APP) && sed -i '/nsd_ptcp.c$$/s/(CFLAGS)/(CFLAGS)
-fno-strict-aliasing/' ./runtime/Makefile
- cd $(DIR_APP) && sed -i '/net.c$$/s/(CFLAGS)/(CFLAGS)
-fno-strict-aliasing/' ./runtime/Makefile
+ #cd $(DIR_APP) && sed -i '/nsd_ptcp.c$$/s/(CFLAGS)/(CFLAGS)
-fno-strict-aliasing/' ./runtime/Makefile
+ #cd $(DIR_APP) && sed -i '/net.c$$/s/(CFLAGS)/(CFLAGS)
-fno-strict-aliasing/' ./runtime/Makefile
cd $(DIR_APP) && make -j $(PARALLELISM) V=1
ifeq "$(RUNNING_TEST)" "yes"
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-24 08:32:10 UTC
(rev 7574)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-24 08:43:14 UTC
(rev 7575)
@@ -260,6 +260,19 @@
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_read.al
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_write.al
##
+## rsyslog-7.6.3
+/usr/lib/rsyslog/imklog.so
+/usr/lib/rsyslog/imuxsock.so
+/usr/lib/rsyslog/lmnet.so
+/usr/lib/rsyslog/lmnetstrms.so
+/usr/lib/rsyslog/lmnsd_ptcp.so
+/usr/lib/rsyslog/lmtcpclt.so
+/usr/sbin/rsyslogd
+/usr/lib/libestr.so.0
+/usr/lib/libestr.so.0.0.0
+/usr/lib/liblogging-stdlog.so.0
+/usr/lib/liblogging-stdlog.so.0.0.0
+##
## squid-3.4.5
/usr/lib/squid/basic_ldap_auth
/usr/lib/squid/basic_msnt_auth
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-05-24 08:32:10 UTC (rev
7574)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-05-24 08:43:14 UTC (rev
7575)
@@ -8,7 +8,7 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.91).<br />
Upgrade dnsmasq to 2.71, e2fsprogs to 1.42.10, fcron to 3.1.3, grep to
2.19,
- openvpn to 2.3.4, squid to 3.4.5, syslinux to 6.02, util-linux to
2.24.2.
+ openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.5, syslinux to 6.02,
util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, Net-DNS to 0.75,
Net-SSLeay to 1.63.
<br />
<b>Mandatory reboot after upgrade.</b>
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-05-24 08:32:10 UTC (rev 7574)
+++ ipcop/trunk/updates/2.1.6/setup 2014-05-24 08:43:14 UTC (rev 7575)
@@ -94,6 +94,9 @@
#
#####
+# Restart rsyslogd to activate new version
+/usr/local/bin/restartsyslogd
+
# Restart dnsmasq
/etc/rc.d/rc.dnsmasq --start
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
