[Ipcop-svn] SF.net SVN: ipcop:[7402] ipcop/trunk

owes Fri, 04 Apr 2014 06:09:28 -0700

Revision: 7402
          http://sourceforge.net/p/ipcop/svn/7402
Author:   owes
Date:     2014-04-04 13:09:04 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Upgrade rrdtool to 1.4.8


Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/rrdtool
    ipcop/trunk/lfs/rrdtool
    ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
    ipcop/trunk/updates/2.1.4/information.xml
    ipcop/trunk/updates/2.1.4/setup

Modified: ipcop/trunk/config/rootfiles/common/rrdtool
===================================================================
--- ipcop/trunk/config/rootfiles/common/rrdtool 2014-04-04 12:51:03 UTC (rev 
7401)
+++ ipcop/trunk/config/rootfiles/common/rrdtool 2014-04-04 13:09:04 UTC (rev 
7402)
@@ -1,17 +1,17 @@
-## rrdtool-1.4.7
-##
 #usr/bin/rrdcached
+#usr/bin/rrdcreate
 #usr/bin/rrdcgi
+#usr/bin/rrdinfo
 usr/bin/rrdtool
 #usr/bin/rrdupdate
 #usr/lib/librrd.la
 #usr/lib/librrd.so
 usr/lib/librrd.so.4
-usr/lib/librrd.so.4.2.0
+usr/lib/librrd.so.4.2.1
 #usr/lib/librrd_th.la
 #usr/lib/librrd_th.so
 usr/lib/librrd_th.so.4
-usr/lib/librrd_th.so.4.2.0
+usr/lib/librrd_th.so.4.2.1
 #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     2014-04-04 12:51:03 UTC (rev 7401)
+++ ipcop/trunk/lfs/rrdtool     2014-04-04 13:09:04 UTC (rev 7402)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = rrdtool
-VER        = 1.4.7
+VER        = 1.4.8
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -45,8 +45,8 @@
 
 # Used to include same timestamp for all
 # This is the release date
-DATESTAMP = "Jan 24 2012"
-TIMESTAMP = "11:11:00"
+DATESTAMP = "May 23 2013"
+TIMESTAMP = "09:58:00"
 
 ###############################################################################
 # Top-level Rules
@@ -56,7 +56,7 @@
 
 $(DL_FILE)     = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f
+$(DL_FILE)_MD5 = dbe59386db97fd2f2216729facd74ca8
 
 install : $(TARGET)
 
@@ -88,9 +88,6 @@
        @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
 
-       # Fix "__STRICT_ANSI__" is not defined, remove after 1.4.7 as upstream 
tree include the fix
-       cd $(DIR_APP) && sed -i -e 's|__STRICT_ANSI__|defined __STRICT_ANSI__|' 
src/gettext.h
-
        # 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
 
@@ -107,7 +104,7 @@
                                        --disable-tcl \
                                        --enable-perl-site-install \
                                        --with-pic
-       cd $(DIR_APP) && make -j $(PARALLELISM) V=1
+       cd $(DIR_APP) && make -j $(PARALLELISM) V=1 LIBS+="-lglib-2.0"
        cd $(DIR_APP) && make install-exec
        cd $(DIR_APP) && make site-perl-install
        mkdir -p /var/log/rrd/

Modified: ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
===================================================================
--- ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4      2014-04-04 12:51:03 UTC 
(rev 7401)
+++ ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4      2014-04-04 13:09:04 UTC 
(rev 7402)
@@ -10,3 +10,12 @@
 /lib/modules/3.4-2/extra/pulsar.ko.gz
 /lib/modules/3.4-2/extra/solos-pci.ko.gz
 /lib/modules/3.4-2/kernel
+##
+## rrdtool-1.4.8
+/usr/bin/rrdtool
+/usr/lib/perl5/site_perl/5.14.2/i486-linux/RRDs.pm
+/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/RRDs/RRDs.so
+/usr/lib/librrd.so.4
+/usr/lib/librrd.so.4.2.1
+/usr/lib/librrd_th.so.4
+/usr/lib/librrd_th.so.4.2.1

Modified: ipcop/trunk/updates/2.1.4/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.4/information.xml   2014-04-04 12:51:03 UTC (rev 
7401)
+++ ipcop/trunk/updates/2.1.4/information.xml   2014-04-04 13:09:04 UTC (rev 
7402)
@@ -4,7 +4,8 @@
         <releasedate>2014-mm-dd</releasedate>
         <size>0</size>
         <isoimages>yes</isoimages>
-        <description>Upgrade e1000e network driver to 3.0.4.1, igb network 
driver to 5.2.5, linux kernel to 3.4.86.
+        <description>Upgrade e1000e network driver to 3.0.4.1, igb network 
driver to 5.2.5, linux kernel to 3.4.86,
+            rrdtool to 1.4.8.
             &lt;br /&gt;
             &lt;b&gt;Mandatory reboot after upgrade.&lt;/b&gt;
         </description>

Modified: ipcop/trunk/updates/2.1.4/setup
===================================================================
--- ipcop/trunk/updates/2.1.4/setup     2014-04-04 12:51:03 UTC (rev 7401)
+++ ipcop/trunk/updates/2.1.4/setup     2014-04-04 13:09:04 UTC (rev 7402)
@@ -63,6 +63,11 @@
 
 # Remove old libraries (version specific)
 # /bin/rm -f .....
+# rrdtool
+/bin/rm -f /usr/lib/librrd.so.4
+/bin/rm -f /usr/lib/librrd.so.4.2.0
+/bin/rm -f /usr/lib/librrd_th.so.4
+/bin/rm -f /usr/lib/librrd_th.so.4.2.0
 
 # For new shared libs. May not always be required, but makes sure we do not 
forget
 /sbin/ldconfig

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

[Ipcop-svn] SF.net SVN: ipcop:[7402] ipcop/trunk

Reply via email to