From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 808465682327a3e8d3dd8e6a3ae247d36751041f Date: Sun, 02 Feb 2014 14:40:46 +0100 Message-ID: <20140202134047.74A672106F@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7441810423635846165==" List-Id: --===============7441810423635846165== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Fri Jan 31 21:23:21 2014 +0100 openvpn: Wrong subnet calculation bug fix. =20 Fixes #10466. commit 178df99a871760cfa773543f3258c04c76fc5d6f Merge: 4a23c55 15b023b Author: Michael Tremer 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 Date: Fri Jan 31 12:31:49 2014 +0100 Update perl-DBI to 1.631 commit abff56f062a1bb09eecc755e61fc7d3e0e37d702 Author: Alexander Marx Date: Fri Jan 31 11:32:11 2014 +0100 perl-File-ReadBackwards added commit 3704887e8edb3a286e30ff3216d845a62c47bb5d Author: Alexander Marx 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 =3D> perl-DBD-SQLite} | 14 +++++++------- lfs/perl-DBI | 4 ++-- lfs/{perl-DBD-mysql =3D> 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 =3D> perl-DBD-SQLite} (94%) copy lfs/{perl-DBD-mysql =3D> perl-File-ReadBackwards} (94%) Difference in files: diff --git a/config/rootfiles/packages/perl-DBD-SQLite b/config/rootfiles/pac= kages/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/Cookbo= ok.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/S= QLite.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQ= Lite.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/D= BD-SQLite +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/D= BD-SQLite/sqlite3.c +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/D= BD-SQLite/sqlite3.h +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/share/dist/D= BD-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/rootf= iles/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/ReadBac= kwards +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBac= kwards/.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=3D(); my %ccdhash=3D(); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - $iprange[0]=3D$ip1.".".$ip2.".".$ip3.".".2; + $iprange[0]=3D$ip1.".".$ip2.".".$ip3.".".($ip4+2); for (my $i=3D1;$i<=3D$count;$i++) { my $tmpip=3D$iprange[$i-1]; my $stepper=3D$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 = # +# = # +# 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 . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 1.40 + +THISAPP =3D DBD-SQLite-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D perl-DBD-SQLite +PAK_VER =3D 1 + +DEPS =3D "perl-DBI" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 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 @@ =20 include Config =20 -VER =3D 1.607 +VER =3D 1.631 =20 THISAPP =3D DBI-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D bd5785b39675213948a61dea1b400012 +$(DL_FILE)_MD5 =3D 444d3c305e86597e11092b517794a840 =20 install : $(TARGET) =20 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 = # +# = # +# 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 . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 1.05 + +THISAPP =3D File-ReadBackwards-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D perl-File-ReadBackwards +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 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 --===============7441810423635846165==--