[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 808465682327a3e8d3dd8e6a3ae247d36751041f - IPFire-SCM

2 Feb 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  808465682327a3e8d3dd8e6a3ae247d36751041f (commit)
       via  178df99a871760cfa773543f3258c04c76fc5d6f (commit)
       via  4a23c55b0dbf07d4a4449ef1ad637acc076fc67c (commit)
       via  abff56f062a1bb09eecc755e61fc7d3e0e37d702 (commit)
       via  3704887e8edb3a286e30ff3216d845a62c47bb5d (commit)
      from  15b023b97944802aae90982511de103310496c31 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 808465682327a3e8d3dd8e6a3ae247d36751041f
Author: Alexander Marx amarx@ipfire.org
Date:   Fri Jan 31 21:23:21 2014 +0100
openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
commit 178df99a871760cfa773543f3258c04c76fc5d6f
Merge: 4a23c55 15b023b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 2 14:38:02 2014 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 4a23c55b0dbf07d4a4449ef1ad637acc076fc67c
Author: Alexander Marx amarx@ipfire.org
Date:   Fri Jan 31 12:31:49 2014 +0100
Update perl-DBI to 1.631
commit abff56f062a1bb09eecc755e61fc7d3e0e37d702
Author: Alexander Marx amarx@ipfire.org
Date:   Fri Jan 31 11:32:11 2014 +0100
perl-File-ReadBackwards added
commit 3704887e8edb3a286e30ff3216d845a62c47bb5d
Author: Alexander Marx amarx@ipfire.org
Date:   Fri Jan 31 10:48:56 2014 +0100
DBD-SQLite Addon added
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/perl-DBD-SQLite         | 15 +++++++++++++++
 config/rootfiles/packages/perl-File-ReadBackwards |  4 ++++
 html/cgi-bin/ovpnmain.cgi                         |  2 +-
 lfs/{perl-DBD-mysql => perl-DBD-SQLite}           | 14 +++++++-------
 lfs/perl-DBI                                      |  4 ++--
 lfs/{perl-DBD-mysql => perl-File-ReadBackwards}   | 14 +++++++-------
 make.sh                                           |  2 ++
 7 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 config/rootfiles/packages/perl-DBD-SQLite
 create mode 100644 config/rootfiles/packages/perl-File-ReadBackwards
 copy lfs/{perl-DBD-mysql => perl-DBD-SQLite} (94%)
 copy lfs/{perl-DBD-mysql => perl-File-ReadBackwards} (94%)
Difference in files:

diff --git a/config/rootfiles/packages/perl-DBD-SQLite b/config/rootfiles/packages/perl-DBD-SQLite
new file mode 100644
index 0000000..74a1fe6
--- /dev/null
+++ b/config/rootfiles/packages/perl-DBD-SQLite
@@ -0,0 +1,15 @@
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite/Cookbook.pod
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQLite.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQLite.so
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3.c
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3.h
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/DBD-SQLite/sqlite3ext.h
+#usr/share/man/man3/DBD::SQLite.3
+#usr/share/man/man3/DBD::SQLite::Cookbook.3
diff --git a/config/rootfiles/packages/perl-File-ReadBackwards b/config/rootfiles/packages/perl-File-ReadBackwards
new file mode 100644
index 0000000..be62542
--- /dev/null
+++ b/config/rootfiles/packages/perl-File-ReadBackwards
@@ -0,0 +1,4 @@
+usr/lib/perl5/site_perl/5.12.3/File/ReadBackwards.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards/.packlist
+#usr/share/man/man3/File::ReadBackwards.3
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 71366cb..8858974 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -509,7 +509,7 @@ sub getccdadresses
    my @iprange=();
    my %ccdhash=();
    &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %ccdhash);
-	$iprange[0]=$ip1.".".$ip2.".".$ip3.".".2;
+	$iprange[0]=$ip1.".".$ip2.".".$ip3.".".($ip4+2);
    for (my $i=1;$i<=$count;$i++) {
    	my $tmpip=$iprange[$i-1];
    	my $stepper=$i*4;
diff --git a/lfs/perl-DBD-SQLite b/lfs/perl-DBD-SQLite
new file mode 100644
index 0000000..aaee284
--- /dev/null
+++ b/lfs/perl-DBD-SQLite
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  IPFire Team  info@ipfire.org                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.40
+
+THISAPP    = DBD-SQLite-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-DBD-SQLite
+PAK_VER    = 1
+
+DEPS       = "perl-DBI"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b9876882186499583428b14cf5c0e29c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/perl-DBI b/lfs/perl-DBI
index 8091374..76e8a25 100644
--- a/lfs/perl-DBI
+++ b/lfs/perl-DBI
@@ -24,7 +24,7 @@
include Config
-VER        = 1.607
+VER        = 1.631
THISAPP    = DBI-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bd5785b39675213948a61dea1b400012
+$(DL_FILE)_MD5 = 444d3c305e86597e11092b517794a840
install : $(TARGET)
diff --git a/lfs/perl-File-ReadBackwards b/lfs/perl-File-ReadBackwards
new file mode 100644
index 0000000..bafd557
--- /dev/null
+++ b/lfs/perl-File-ReadBackwards
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2011  IPFire Team  info@ipfire.org                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.05
+
+THISAPP    = File-ReadBackwards-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-File-ReadBackwards
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 613d9d02de6c1d86d5fa5b8816a6b214
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 186e65f..0e9099b 100755
--- a/make.sh
+++ b/make.sh
@@ -716,6 +716,8 @@ buildipfire() {
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
+  ipfiremake perl-DBD-SQLite
+  ipfiremake perl-File-ReadBackwards
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake openvmtools
hooks/post-receive
--
IPFire 2.x development tree

    