Revision: 6275
http://ipcop.svn.sourceforge.net/ipcop/?rev=6275&view=rev
Author: owes
Date: 2012-01-28 23:49:40 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
Update rrdtool to 1.4.7
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/rrdtool
ipcop/trunk/lfs/rrdtool
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/rrdtool-1.4.6_perl-make-fix.patch
Modified: ipcop/trunk/config/rootfiles/common/rrdtool
===================================================================
--- ipcop/trunk/config/rootfiles/common/rrdtool 2012-01-28 21:19:05 UTC (rev
6274)
+++ ipcop/trunk/config/rootfiles/common/rrdtool 2012-01-28 23:49:40 UTC (rev
6275)
@@ -1,17 +1,17 @@
-## rrdtool-1.4.6
+## rrdtool-1.4.7
##
#usr/bin/rrdcached
#usr/bin/rrdcgi
usr/bin/rrdtool
#usr/bin/rrdupdate
#usr/lib/librrd.la
-usr/lib/librrd.so
-usr/lib/librrd.so.3
-usr/lib/librrd.so.3.2.4
+#usr/lib/librrd.so
+usr/lib/librrd.so.4
+usr/lib/librrd.so.4.2.0
#usr/lib/librrd_th.la
-usr/lib/librrd_th.so
-usr/lib/librrd_th.so.3
-usr/lib/librrd_th.so.3.2.4
+#usr/lib/librrd_th.so
+usr/lib/librrd_th.so.4
+usr/lib/librrd_th.so.4.2.0
#usr/lib/perl5/site_perl/PERLVER/RRDp.pm
usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/RRDs.pm
#usr/lib/perl5/site_perl/PERLVER/MACHINE-linux/auto/RRDp
Modified: ipcop/trunk/lfs/rrdtool
===================================================================
--- ipcop/trunk/lfs/rrdtool 2012-01-28 21:19:05 UTC (rev 6274)
+++ ipcop/trunk/lfs/rrdtool 2012-01-28 23:49:40 UTC (rev 6275)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = rrdtool
-VER = 1.4.6
+VER = 1.4.7
HOST_ARCH = all
OTHER_SRC = yes
@@ -45,8 +45,8 @@
# Used to include same timestamp for all
# This is the release date
-DATESTAMP = "Jan 16 2012"
-TIMESTAMP = "15:49:00"
+DATESTAMP = "Jan 24 2012"
+TIMESTAMP = "11:11:00"
###############################################################################
# Top-level Rules
@@ -56,7 +56,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f62316beba89b5f31880850d2c2a5267
+$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f
install : $(TARGET)
@@ -87,7 +87,6 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e 's|__DATE__|$(DATESTAMP)|' -e
's|__TIME__|$(TIMESTAMP)|' src/rrd_tool.c
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_perl-make-fix.patch
# we may really remove rpath from RRDs.so using this borrowed from
Fedora, but is it really better
# cd $(DIR_APP) && sed -i -e 's|-Wl,--rpath -Wl,\$$rp||g'
bindings/perl-shared/Makefile.PL
Deleted: ipcop/trunk/src/patches/rrdtool-1.4.6_perl-make-fix.patch
===================================================================
--- ipcop/trunk/src/patches/rrdtool-1.4.6_perl-make-fix.patch 2012-01-28
21:19:05 UTC (rev 6274)
+++ ipcop/trunk/src/patches/rrdtool-1.4.6_perl-make-fix.patch 2012-01-28
23:49:40 UTC (rev 6275)
@@ -1,16 +0,0 @@
-From upstream: remove perl 5.004 compatibility hack and make things work on
newer perls in exchange :-)
-
---- a/bindings/perl-shared/RRDs.xs (revision 2236)
-+++ b/bindings/perl-shared/RRDs.xs (revision 2258)
-@@ -32,10 +32,4 @@
- #define VERSION VERSION_SAVED
- #undef VERSION_SAVED
--
--/* perl 5.004 compatibility */
--#ifndef PL_sv_undef
--#define PL_sv_undef sv_undef
--#endif
--
-
- #define rrdcode(name) \
-
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-28 21:19:05 UTC
(rev 6274)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-01-28 23:49:40 UTC
(rev 6275)
@@ -256,10 +256,10 @@
/usr/bin/rrdtool
/usr/lib/perl5/site_perl/5.10.1/i486-linux/RRDs.pm
/usr/lib/perl5/site_perl/5.10.1/i486-linux/auto/RRDs/RRDs.so
-/usr/lib/librrd.so.3
-/usr/lib/librrd.so.3.2.4
-/usr/lib/librrd_th.so.3
-/usr/lib/librrd_th.so.3.2.4
+/usr/lib/librrd.so.4
+/usr/lib/librrd.so.4.2.0
+/usr/lib/librrd_th.so.4
+/usr/lib/librrd_th.so.4.2.0
##
## sqlite-3.7.9
/usr/bin/sqlite3
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2012-01-28 21:19:05 UTC (rev
6274)
+++ ipcop/trunk/updates/2.0.3/information.xml 2012-01-28 23:49:40 UTC (rev
6275)
@@ -12,7 +12,7 @@
conntrack-tools to 1.0.1, DBD-SQLite to 1.35, diffutils to 3.2,
freetype to 2.4.8, gmp to 5.0.3, grep to 2.10, iproute2 to 3.2.0,
iptables to 1.4.12.2, iw to 3.2,
kbd to 1.15.3, kernel to 2.6.32.55, libnetfilter_conntrack to
1.0.0, libnl to 3.2.3, libpcap to 1.2.1, ntp to 4.2.6p5,
- openssl to 1.0.0g, openvpn to 2.2.2, rrdtool to 1.4.6,
smartmontools to 5.42, Solos PCI to 1.03,
+ openssl to 1.0.0g, openvpn to 2.2.2, rrdtool to 1.4.7,
smartmontools to 5.42, Solos PCI to 1.03,
sqlite to 3.7.9, squid to 3.1.18, tcpdump to 4.2.1, usbutils to
004, usb-modeswitch to 1.2.1.
<br />
<b>Mandatory reboot after upgrade.</b>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2012-01-28 21:19:05 UTC (rev 6274)
+++ ipcop/trunk/updates/2.0.3/setup 2012-01-28 23:49:40 UTC (rev 6275)
@@ -83,9 +83,9 @@
/bin/rm -f /usr/lib/libnl.so.2
/bin/rm -f /usr/lib/libnl.so.2.0.0
/bin/rm -f /usr/lib/libpcap.so.1.2.0
-/bin/rm -f /usr/lib/librrd.so.4
+/bin/rm -f /usr/lib/librrd.so
/bin/rm -f /usr/lib/librrd.so.4.1.4
-/bin/rm -f /usr/lib/librrd_th.so.4
+/bin/rm -f /usr/lib/librrd_th.so
/bin/rm -f /usr/lib/librrd_th.so.4.1.4
# For new shared libs. May not always be required, but makes sure we do not
forget
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
