IPFire-SCM March 2012

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d137cccc3d39f9036ca5f02cecc5604a9f5a51bd
by git＠ipfire.org 10 Mar '12

10 Mar '12

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 3.x development tree". The branch, master has been updated via d137cccc3d39f9036ca5f02cecc5604a9f5a51bd (commit) via 041a6c71b9bea5593365ddf41e547157cf8b5af9 (commit) via cb1de7e7d5f0177515e160324bf6ac61954fd0bd (commit) via 0ab7e541a8ae639c24c7836b4c8c4b791c828ce9 (commit) from 63c2bb861b082f50a2707b0b1546f41b53801bdb (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 d137cccc3d39f9036ca5f02cecc5604a9f5a51bd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 10 12:10:12 2012 +0100 gettext: autopoint (-devel package) requires git at runtime. commit 041a6c71b9bea5593365ddf41e547157cf8b5af9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 10 12:09:42 2012 +0100 freeradius: Fix package name and make it compile on x86_64. commit cb1de7e7d5f0177515e160324bf6ac61954fd0bd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 10 12:09:06 2012 +0100 xorg-x11-proto-devel: Fix invalid location of .pc files. commit 0ab7e541a8ae639c24c7836b4c8c4b791c828ce9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 8 00:11:50 2012 +0100 cpufrequtils: Remove package. The functionality is now provided by cpupower which comes with the Linux kernel (kernel-tools). ----------------------------------------------------------------------- Summary of changes: cpufrequtils/cpufrequtils.nm | 43 ------------------- .../patches/cpufrequtils-008-aperf-32bit.patch | 11 ----- .../patches/cpufrequtils-008-no-aperf-on-ppc.patch | 45 -------------------- cpufrequtils/patches/cpufrequtils-multilib.patch | 12 ----- cpufrequtils/patches/disable-gsic.patch | 11 ----- freeradius/freeradius.nm | 16 ++++--- gettext/gettext.nm | 3 +- xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 8 +++- 8 files changed, 17 insertions(+), 132 deletions(-) delete mode 100644 cpufrequtils/cpufrequtils.nm delete mode 100644 cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch delete mode 100644 cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch delete mode 100644 cpufrequtils/patches/cpufrequtils-multilib.patch delete mode 100644 cpufrequtils/patches/disable-gsic.patch Difference in files: diff --git a/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm deleted file mode 100644 index 6465a45..0000000 --- a/cpufrequtils/cpufrequtils.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = cpufrequtils -version = 008 -release = 5 - -groups = Applications/System -url = http://htop.sourceforge.net/ -license = GPLv2 -summary = Command line tools to determine current CPUfreq settings and to modify them - -description - Command line tools to determine current CPUfreq settings and to modify them -end - -source_dl = - -build - requires - gettext - libtool - sysfsutils - end - - make_install_targets += mandir=/usr/share/man -end - -packages - package %{name} - groups += Base - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch b/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch deleted file mode 100644 index ae94b0a..0000000 --- a/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpufrequtils-008/utils/aperf.c 2010-07-05 17:43:17.000000000 +0200 -+++ cpufrequtils-008/utils/aperf.c.new 2011-02-07 16:34:17.421278000 +0100 -@@ -96,7 +96,7 @@ - return -1; - if (lseek(fd, idx, SEEK_CUR) == -1) - goto err; -- if (read(fd, val, sizeof val) != sizeof *val) -+ if (read(fd, val, sizeof *val) != sizeof *val) - goto err; - close(fd); - return 0; diff --git a/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch b/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch deleted file mode 100644 index 8bfca01..0000000 --- a/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- cpufrequtils-008/Makefile 2011-02-10 13:04:49.235589962 +0100 -+++ cpufrequtils-008/Makefile.new 2011-02-10 13:08:00.481589942 +0100 -@@ -118,7 +118,7 @@ - CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ - -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE - --UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h -+UTIL_SRC = utils/info.c utils/set.c - LIB_HEADERS = lib/cpufreq.h lib/interfaces.h - LIB_SRC = lib/cpufreq.c - LIB_OBJS = lib/cpufreq.o -@@ -199,7 +199,7 @@ - $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq - $(QUIET) $(STRIPCMD) $@ - --utils: cpufreq-info cpufreq-set cpufreq-aperf -+utils: cpufreq-info cpufreq-set - - po/$(PACKAGE).pot: $(UTIL_SRC) - @xgettext --default-domain=$(PACKAGE) --add-comments \ -@@ -229,7 +229,7 @@ - clean: - -find . $ -not -type d $ -and $ -name '*~' -o -name '*.[oas]' $ -type f -print \ - | xargs rm -f -- -rm -f cpufreq-info cpufreq-set cpufreq-aperf -+ -rm -f cpufreq-info cpufreq-set - -rm -f libcpufreq.so* - -rm -f build/ccdv - -rm -rf po/*.gmo po/*.pot -@@ -246,7 +246,6 @@ - $(INSTALL) -d $(DESTDIR)${bindir} - $(INSTALL_PROGRAM) cpufreq-set $(DESTDIR)${bindir}/cpufreq-set - $(INSTALL_PROGRAM) cpufreq-info $(DESTDIR)${bindir}/cpufreq-info -- $(INSTALL_PROGRAM) cpufreq-aperf $(DESTDIR)${bindir}/cpufreq-aperf - - install-man: - $(INSTALL_DATA) -D man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1 -@@ -270,7 +269,6 @@ - - rm -f $(DESTDIR)${includedir}/cpufreq.h - - rm -f $(DESTDIR)${bindir}/cpufreq-set - - rm -f $(DESTDIR)${bindir}/cpufreq-info -- - rm -f $(DESTDIR)${bindir}/cpufreq-aperf - - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1 - - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1 - - for HLANG in $(LANGUAGES); do \ diff --git a/cpufrequtils/patches/cpufrequtils-multilib.patch b/cpufrequtils/patches/cpufrequtils-multilib.patch deleted file mode 100644 index cc4d8d2..0000000 --- a/cpufrequtils/patches/cpufrequtils-multilib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cpufrequtils-008/Makefile 2010-07-05 17:43:17.000000000 +0200 -+++ Makefile.multilib 2010-07-16 11:31:40.294161413 +0200 -@@ -206,6 +206,9 @@ - --keyword=_ --keyword=N_ $(UTIL_SRC) && \ - test -f $(PACKAGE).po && \ - mv -f $(PACKAGE).po po/$(PACKAGE).pot -+# Avoid multilib issues by forcing the POT creation date -+ sed -i 's/POT-Creation-Date: .*\\/Pot-Creation-Date: 2010-07-16 11:00+0200\\/' \ -+ po/${PACKAGE}.pot - - update-gmo: po/$(PACKAGE).pot - @for HLANG in $(LANGUAGES); do \ diff --git a/cpufrequtils/patches/disable-gsic.patch b/cpufrequtils/patches/disable-gsic.patch deleted file mode 100644 index ccf059c..0000000 --- a/cpufrequtils/patches/disable-gsic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpufrequtils-0.3/debug/i386/Makefile~ 2004-12-04 15:58:54.287473296 -0500 -+++ cpufrequtils-0.3/debug/i386/Makefile 2004-12-04 15:59:08.035383296 -0500 -@@ -12,7 +12,7 @@ intel_gsic: intel_gsic.c - powernow-k8-decode: powernow-k8-decode.c - $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c - --all: centrino-decode dump_psb intel_gsic powernow-k8-decode -+all: centrino-decode dump_psb powernow-k8-decode - - clean: - rm -rf centrino-decode dump_psb intel_gsic powernow-k8-decode diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm index a9ea8be..eec0ec2 100644 --- a/freeradius/freeradius.nm +++ b/freeradius/freeradius.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = freeradius-server +name = freeradius version = 2.1.12 -release = 3 +release = 4 +thisapp = %{name}-server-%{version} groups = System/Daemons url = http://www.freeradius.org @@ -37,9 +38,7 @@ build configure_options +=\ %{CONFIGURE_ARCH} \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius \ - --localstatedir=/var \ + --libdir=%{libdir}/freeradius \ --with-system-libtool \ --with-threads \ --with-thread-pool \ @@ -97,7 +96,7 @@ end quality-agent whitelist_rpath - /usr/lib/freeradius + %{libdir}/freeradius end end @@ -107,7 +106,10 @@ packages /etc/raddb/radiusd.conf end - prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end script prein %{create_user} diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 98a5fca..3416a0a 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@ name = gettext version = 0.18.1.1 -release = 6 +release = 7 groups = System/Base url = http://www.gnu.org/software/gettext/ @@ -73,6 +73,7 @@ packages requires gettext-common-devel=%{thisver} gettext-libs=%{thisver} + git end files += \ diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm index 610c7ad..02b5473 100644 --- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm +++ b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm @@ -5,7 +5,7 @@ name = xorg-x11-proto-devel version = 7.4 -release = 2 +release = 3 arch = noarch maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> @@ -58,6 +58,11 @@ build done end + # Place the .pc files in /usr/share so they + # can be found on all architectures where libdir != /usr/lib. + configure_options += \ + --libdir=%{datadir} + build for object in %{sources}; do cd %{DIR_SRC}/${object%*.tar.bz2} @@ -78,5 +83,4 @@ end packages package %{name} - end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 63c2bb861b082f50a2707b0b1546f41b53801bdb
by git＠ipfire.org 07 Mar '12

07 Mar '12

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 3.x development tree". The branch, master has been updated via 63c2bb861b082f50a2707b0b1546f41b53801bdb (commit) via c3197273dd108c58e41048865fc3f358c2247a8c (commit) from 5218f081de12b420175b419d1f96f0c9b7a3e56b (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 63c2bb861b082f50a2707b0b1546f41b53801bdb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 8 00:08:56 2012 +0100 pakfire: Add some patches from upstream. Those patches fix the sharedstatedir variable, fix a the library check on GCC updates and don't download mirror lists inside the build root unless they are needed. commit c3197273dd108c58e41048865fc3f358c2247a8c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 23:59:13 2012 +0100 dialog: Make package compile on x86_64. ----------------------------------------------------------------------- Summary of changes: dialog/dialog.nm | 15 ++--- pakfire/pakfire.nm | 2 +- .../pakfire-0.9.20-dont-download-mirrorlists.patch | 53 ++++++++++++++++++++ .../patches/pakfire-0.9.20-fix-library-check.patch | 36 +++++++++++++ .../patches/pakfire-0.9.20-sharedstatedir.patch | 25 +++++++++ 5 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 pakfire/patches/pakfire-0.9.20-dont-download-mirrorlists.patch create mode 100644 pakfire/patches/pakfire-0.9.20-fix-library-check.patch create mode 100644 pakfire/patches/pakfire-0.9.20-sharedstatedir.patch Difference in files: diff --git a/dialog/dialog.nm b/dialog/dialog.nm index b46ae2b..17d5d9f 100644 --- a/dialog/dialog.nm +++ b/dialog/dialog.nm @@ -6,7 +6,7 @@ name = dialog version = 1.1 svn_ver = 20111020 -release = 1.%{svn_ver} +release = 2.%{svn_ver} thisapp = %{name}-%{version}-%{svn_ver} groups = Applications/System @@ -27,6 +27,7 @@ sources = %{thisapp}.tgz build requires + chrpath findutils gettext libtool @@ -37,17 +38,13 @@ build --enable-nls \ --with-libtool \ --with-ncursesw \ - --includedir=/usr/include/dialog \ - --mandir=/usr/share/man + --includedir=/usr/include/dialog install_cmds - chmod -v 755 %{BUILDROOT}/usr/lib/libdialog.so.*.*.* - end -end + chmod -v 755 %{BUILDROOT}%{libdir}/libdialog.so.*.*.* -quality-agent - whitelist_rpath - /usr/lib + # Remove RPATH. + chrpath --delete %{BUILDROOT}%{bindir}/dialog end end diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 8490682..c5b65e3 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.20 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/pakfire-0.9.20-dont-download-mirrorlists.patch b/pakfire/patches/pakfire-0.9.20-dont-download-mirrorlists.patch new file mode 100644 index 0000000..c8cafc6 --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-dont-download-mirrorlists.patch @@ -0,0 +1,53 @@ +From 90919c62214dd821048027cce5752a8d7f64d437 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 29 Feb 2012 18:37:50 +0100 +Subject: [PATCH] Don't download mirrorlist at repository initialization. + +--- + python/pakfire/downloader.py | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/python/pakfire/downloader.py b/python/pakfire/downloader.py +index 3bfbff2..f89681f 100644 +--- a/python/pakfire/downloader.py ++++ b/python/pakfire/downloader.py +@@ -190,8 +190,6 @@ class MirrorList(object): + # Save URL to more mirrors. + self.mirrorlist = repo._mirrors + +- self.update(force=False) +- + @property + def distro(self): + return self.repo.distro +@@ -245,6 +243,7 @@ class MirrorList(object): + f.close() + + # Read mirrorlist from cache and parse it. ++ self.forget_mirrors() + with self.cache.open(cache_filename) as f: + self.parse_mirrordata(f.read()) + +@@ -259,6 +258,9 @@ class MirrorList(object): + + self.__mirrors.append(mirror) + ++ def forget_mirrors(self): ++ self.__mirrors = [] ++ + @property + def preferred(self): + """ +@@ -289,6 +291,9 @@ class MirrorList(object): + """ + Return a MirrorGroup object for the given grabber. + """ ++ # Make sure the mirrorlist is up to date. ++ self.update() ++ + # A list of mirrors that is passed to MirrorGroup. + mirrors = [] + +-- +1.7.3.4 + diff --git a/pakfire/patches/pakfire-0.9.20-fix-library-check.patch b/pakfire/patches/pakfire-0.9.20-fix-library-check.patch new file mode 100644 index 0000000..8bde631 --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-fix-library-check.patch @@ -0,0 +1,36 @@ +From 1f2968430df446dcbf0e27ff870ac7aa6e8113cd Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Tue, 6 Mar 2012 16:11:01 +0100 +Subject: [PATCH] Fix library check when updating GCC. + +As it only happens on ARM, the new GCC libdir is not found. +--- + tools/quality-agent.d/003-libs-location | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location +index 48b2521..ce5ba72 100755 +--- a/tools/quality-agent.d/003-libs-location ++++ b/tools/quality-agent.d/003-libs-location +@@ -16,13 +16,16 @@ esac + + # Find gcc libdir. + gcc_libdir=$(gcc -print-libgcc-file-name) +-gcc_libdir=$(dirname ${gcc_libdir}) ++for i in 1 2; do ++ gcc_libdir=$(dirname ${gcc_libdir}) ++done ++gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1) + + function check() { + local failed=0 + local found + +- for lib in $(find ${BUILDROOT}/${libdir} -type f -name "lib*.so.*" 2>/dev/null); do ++ for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do + lib=${lib##*/} + lib=${lib%%.so*} + +-- +1.7.3.4 + diff --git a/pakfire/patches/pakfire-0.9.20-sharedstatedir.patch b/pakfire/patches/pakfire-0.9.20-sharedstatedir.patch new file mode 100644 index 0000000..8c582bd --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-sharedstatedir.patch @@ -0,0 +1,25 @@ +From 7cefdc0a2cb917e16c95d522fb1e3d4ed600faca Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 7 Mar 2012 17:11:37 +0100 +Subject: [PATCH] Fix definition of sharedstatedir. + +--- + macros/arch.macro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/macros/arch.macro b/macros/arch.macro +index e756b8e..536e9d2 100644 +--- a/macros/arch.macro ++++ b/macros/arch.macro +@@ -8,7 +8,7 @@ sbindir = %{exec_prefix}/sbin + libexecdir = %{exec_prefix}/lib + datadir = %{prefix}/share + sysconfdir = /etc +-sharedstatedir = %{prefix}/com ++sharedstatedir = %{localstatedir}/lib + localstatedir = /var + lib = lib + libdir = %{exec_prefix}/%{lib} +-- +1.7.3.4 + hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5218f081de12b420175b419d1f96f0c9b7a3e56b
by git＠ipfire.org 07 Mar '12

07 Mar '12

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 3.x development tree". The branch, master has been updated via 5218f081de12b420175b419d1f96f0c9b7a3e56b (commit) via 9763a93ca15a78f51e059e5ca511aa62f2d70669 (commit) via b7923add2f053fd0b89e6bf019f0a73337204f17 (commit) via a12e68242c16f46b1f0268d081ccd9c39fc86c63 (commit) via f2f0bf3978ec22ef866a17d10adc2229156851fa (commit) via 9c53ee69d7985ee7e222838e140ece4780a54f3a (commit) via 4ae04e6cb5f74575102e6582287dba27277de09e (commit) from e3642ca4cac087f13b2e85596dc967070c395a10 (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 5218f081de12b420175b419d1f96f0c9b7a3e56b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 17:41:39 2012 +0100 grub: Fix build on x86_64. commit 9763a93ca15a78f51e059e5ca511aa62f2d70669 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 17:10:54 2012 +0100 gcc: Update to 4.6.3. A bugfix release with a great amount of fixes. commit b7923add2f053fd0b89e6bf019f0a73337204f17 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 17:04:16 2012 +0100 util-linux: Update to 2.21. commit a12e68242c16f46b1f0268d081ccd9c39fc86c63 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 17:01:35 2012 +0100 libpipeline: Update to 1.2.1. commit f2f0bf3978ec22ef866a17d10adc2229156851fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 16:56:14 2012 +0100 qt: Fix build for x86_64. commit 9c53ee69d7985ee7e222838e140ece4780a54f3a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 16:25:19 2012 +0100 grep: Update to 2.11. commit 4ae04e6cb5f74575102e6582287dba27277de09e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 7 15:45:28 2012 +0100 kmod: Update to 6. Mostly a maintainance release. Source files are now located at kernel.org. ----------------------------------------------------------------------- Summary of changes: gcc/gcc.nm | 4 +- grep/grep.nm | 4 +- grub/grub.nm | 46 ++++++++++++++++++++++++++++++++----------- kmod/kmod.nm | 7 ++--- libpipeline/libpipeline.nm | 5 +-- qt/qt.nm | 32 +++++++++++++++++++----------- util-linux/util-linux.nm | 4 +- 7 files changed, 65 insertions(+), 37 deletions(-) Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index b32e028..e25258c 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,8 +7,8 @@ build_cloog_ppl = 1 name = gcc -version = 4.6.2 -release = 14 +version = 4.6.3 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers diff --git a/grep/grep.nm b/grep/grep.nm index f50b4cb..2057f8b 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,8 +4,8 @@ ############################################################################### name = grep -version = 2.10 -release = 2 +version = 2.11 +release = 1 groups = Applications/Text url = http://www.gnu.org/software/grep/ diff --git a/grub/grub.nm b/grub/grub.nm index feb62ba..b3a0c6d 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@ name = grub version = 1.99 -release = 4 +release = 5 sup_arches = x86_64 i686 groups = System/Boot @@ -36,15 +36,11 @@ build zlib-devel end - # Can only use very basic CFLAGS. - export CFLAGS = -Os -pipe - export CXXFLAGS = %{CFLAGS} - prepare_cmds # Replace pkglib_DATA (automake 1.11.2 incompatibility) sed -i -e "s/pkglib_DATA/pkgdata_DATA/g" \ -e "s/pkglib_SCRIPTS/pkgdata_SCRIPTS/g" \ - Makefile.am conf/Makefile.common \ + Makefile* */Makefile* \ gentpl.py util/grub-*.in ./autogen.sh @@ -54,16 +50,40 @@ build cp -R . %{DIR_SRC}/%{thisapp}-efi end + # As the modules contain always 32 bit code, they + # should be living in /usr/lib. + libdir = %{prefix}/lib + configure_options += \ + --target="i386" \ --sbindir=/sbin \ - --with-platform=pc + --datadir=%{libdir} \ + --with-platform=pc \ + --program-transform-name=s,grub,grub, \ + --disable-werror \ + CFLAGS="$(echo %{CFLAGS} | sed \ + -e 's/-fstack-protector//g' \ + -e 's/--param=ssp-buffer-size=4//g' \ + -e 's/-mregparm=3/-mregparm=4/g' \ + -e 's/-fexceptions//g' \ + -e 's/-m64//g' \ + -e 's/-fasynchronous-unwind-tables//g' )" build_cmds cd ../%{thisapp}-efi - #./autogen.sh - ./configure %{configure_options} \ + ./configure \ + %{configure_options} \ --with-platform=efi \ - --program-transform-name=s,grub,grub-efi, + --program-transform-name=s,grub,grub-efi, \ + CFLAGS="$(echo %{CFLAGS} | sed \ + -e 's/-O.//g' \ + -e 's/-fstack-protector//g' \ + -e 's/--param=ssp-buffer-size=4//g' \ + -e 's/-mregparm=3/-mregparm=4/g' \ + -e 's/-fexceptions//g' \ + -e 's/-m64//g' \ + -e 's/-fasynchronous-unwind-tables//g' )" + make %{PARALLELISMFLAGS} ./grub-mkimage \ @@ -75,12 +95,11 @@ build search font gfxterm echo video efi_gop efi_uga end - install_cmds + install cd ../%{thisapp}-efi make install DESTDIR=%{BUILDROOT} mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi} - mv -v %{BUILDROOT}/usr/lib/grub{,-efi} sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \ -i %{BUILDROOT}/sbin/grub-efi-mkconfig @@ -90,6 +109,9 @@ build ln -svf ../boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg %{BUILDROOT}/etc/grub-efi.cfg install -m 755 grub.efi %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.efi + cd - + make install DESTDIR=%{BUILDROOT} + # Install theme file install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/ diff --git a/kmod/kmod.nm b/kmod/kmod.nm index b6f1326..00233cf 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,8 +4,8 @@ ############################################################################### name = kmod -version = 5 -release = 2 +version = 6 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Kernel @@ -20,8 +20,7 @@ description filesystems are two examples of loaded and unloaded modules. end -# Will eventually move to kernel.org. -source_dl = http://packages.profusion.mobi/kmod/ +source_dl = ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/ sources = %{thisapp}.tar.xz build diff --git a/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm index c536452..706de27 100644 --- a/libpipeline/libpipeline.nm +++ b/libpipeline/libpipeline.nm @@ -4,7 +4,7 @@ ############################################################################### name = libpipeline -version = 1.2.0 +version = 1.2.1 release = 1 groups = Development/Libraries @@ -17,11 +17,10 @@ description in a flexible and convenient way. end -source_dl = +source_dl = http://download.savannah.gnu.org/releases/libpipeline/ packages package %{name} - end package %{name}-devel template DEVEL diff --git a/qt/qt.nm b/qt/qt.nm index b9a952f..7df524b 100644 --- a/qt/qt.nm +++ b/qt/qt.nm @@ -5,7 +5,7 @@ name = qt version = 4.7.0 -release = 3 +release = 4 groups = System/Libraries url = http://www.qtsoftware.com/ @@ -44,10 +44,11 @@ build configure_options = -v \ -prefix /usr \ - -datadir /usr/lib/qt4 \ - -headerdir /usr/include \ - -plugindir /usr/lib/qt4/plugins \ - -translationdir /usr/share/qt4/translations \ + -libdir %{libdir} \ + -datadir %{datadir}/qt4 \ + -headerdir %{includedir} \ + -plugindir %{libdir}/qt4/plugins \ + -translationdir %{datadir}/qt4/translations \ -confirm-license \ -fontconfig \ -largefile \ @@ -107,6 +108,9 @@ build prepare_cmds sed -e "s/-O2/%{CFLAGS}/g" -i mkspecs/*/qmake.conf + + # Disable the strip command to get a useful debuginfo package. + sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf end install @@ -116,18 +120,22 @@ end packages package %{name} + + package %{name}-libs + template LIBS + + files += %{libdir}/qt4/plugins + files += %{datadir}/qt4/phrasebooks + files += %{datadir}/qt4/translations end package %{name}-devel template DEVEL - files - /usr/lib/*.prl \ - /usr/lib/qt4/q3porting.xml \ - /usr/bin \ - /usr/lib/qt4/*.prl \ - /usr/lib/qt4/mkspecs - end + files += %{libdir}/*.prl + files += %{libdir}/qt4/q3porting.xml + files += %{libdir}/qt4/*.prl + files += %{datadir}/qt4/mkspecs end package %{name}-debuginfo diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index ade2ab4..dd825c9 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,9 +4,9 @@ ############################################################################### name = util-linux -major_ver = 2.20 +major_ver = 2.21 version = %{major_ver} -release = 3 +release = 1 groups = System/Base url = http://kernel.org/~kzak/util-linux/ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 54fd05358b874a2bbb5c0f58f4a04f010c196388
by git＠ipfire.org 06 Mar '12

06 Mar '12

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 54fd05358b874a2bbb5c0f58f4a04f010c196388 (commit) from 650a4d8097023cc6e8f54d86db377e756a29c07c (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 54fd05358b874a2bbb5c0f58f4a04f010c196388 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 6 22:53:07 2012 +0100 Import VPN changes by the Special Interest Group. See here for more details: http://lists.ipfire.org/pipermail/sig-vpn/2012-March/000031.html ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 8 + config/rootfiles/common/Net-Telnet | 4 + config/rootfiles/core/58/filelists/Net-Telnet | 1 + html/cgi-bin/index.cgi | 46 ++++ html/cgi-bin/ovpnmain.cgi | 304 ++++++++++++++++++++----- langs/de/cgi-bin/de.pl | 4 + lfs/{Crypt-PasswdMD5 => Net-Telnet} | 6 +- make.sh | 1 + 8 files changed, 308 insertions(+), 66 deletions(-) create mode 100644 config/rootfiles/common/Net-Telnet create mode 120000 config/rootfiles/core/58/filelists/Net-Telnet copy lfs/{Crypt-PasswdMD5 => Net-Telnet} (96%) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index cd4bfd5..567f2e1 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -414,6 +414,14 @@ sub ipcidr return "$ip\/$cidr"; } +sub ipcidr2msk +{ + my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift); + my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr); + return "$ip\/$netmask"; +} + + sub validemail { my $mail = shift; return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\(a)[0-9a-zA-Z\.\-]+$/ ); diff --git a/config/rootfiles/common/Net-Telnet b/config/rootfiles/common/Net-Telnet new file mode 100644 index 0000000..8769517 --- /dev/null +++ b/config/rootfiles/common/Net-Telnet @@ -0,0 +1,4 @@ +usr/lib/perl5/site_perl/5.12.3/Net/Telnet.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet/.packlist +#usr/share/man/man3/Net::Telnet.3 diff --git a/config/rootfiles/core/58/filelists/Net-Telnet b/config/rootfiles/core/58/filelists/Net-Telnet new file mode 120000 index 0000000..66ca926 --- /dev/null +++ b/config/rootfiles/core/58/filelists/Net-Telnet @@ -0,0 +1 @@ +../../../common/Net-Telnet \ No newline at end of file diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index b325250..0023523 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -20,6 +20,7 @@ ############################################################################### use strict; +use Net::Telnet; # enable only the following on debugging purpose #use warnings; @@ -387,9 +388,54 @@ END <tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br> <td width='30%' align='center'>$ovpnip <td width='45%' align='center'><font color=$Header::colourgreen>Online</font> + END + } +### +# m.a.d n2n +### + +if ( -d "${General::swroot}/ovpn/n2nconf") { +my %confighash=(); +my $display = ''; + +&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); +foreach my $dkey (keys %confighash) { +if ($confighash{$dkey}[3] eq 'net') { + + + if (-e "/var/run/$confighash{$dkey}[1]n2n.pid") { + my @output = ""; + my @tustate = ""; + my $tport = $confighash{$dkey}[22]; + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + if ($tport ne '') { + $tnet->open('127.0.0.1'); + @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + @tustate = split(/\,/, $output[1]); + if ( $tustate[1] eq 'CONNECTED') + { $display = "<font color=$Header::colourgreen>$Lang::tr{'capsopen'}</font>"; + } else { + $display = "<font color=$Header::colourred>$tustate[1]</font>"; } + + print <<END; + <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br> + <td width='30%' align='center'> $confighash{$dkey}[10]<td width='45%' align='center'> $display + +END +; +} +} +} +} +} + +### +# m.a.d n2n end +### + # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b6c5fc0..4bfb6aa 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -18,11 +18,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # ############################################################################### - +### +# Based on IPFireCore 55 +### use CGI; use CGI qw/:standard/; use Net::DNS; use Net::Ping; +use Net::Telnet; use File::Copy; use File::Temp qw/ tempfile tempdir /; use strict; @@ -33,8 +36,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy); @@ -57,6 +60,7 @@ my %selected=(); my $warnmessage = ''; my $errormessage = ''; my %settings=(); +my $routes_push_file = ''; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); $cgiparams{'ENABLED'} = 'off'; $cgiparams{'ENABLED_BLUE'} = 'off'; @@ -70,9 +74,11 @@ $cgiparams{'CA_NAME'} = ''; $cgiparams{'DHCP_DOMAIN'} = ''; $cgiparams{'DHCP_DNS'} = ''; $cgiparams{'DHCP_WINS'} = ''; +$cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; - +$routes_push_file = "${General::swroot}/ovpn/routes_push"; +unless (-e $routes_push_file) { system("touch $routes_push_file"); } &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -307,10 +313,13 @@ sub disallowreserved return; } + sub writeserverconf { - my %sovpnsettings = (); + my %sovpnsettings = (); + my @temp = (); &General::readhash("${General::swroot}/ovpn/settings", \%sovpnsettings); - + &read_routepushfile; + open(CONF, ">${General::swroot}/ovpn/server.conf") or die "Unable to open ${General::swroot}/ovpn/server.conf: $!"; flock CONF, 2; print CONF "#OpenVPN Server conf\n"; @@ -333,6 +342,16 @@ sub writeserverconf { my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'}); print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n"; print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; + + if ($vpnsettings{'ROUTES_PUSH'} ne '') { + @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); + foreach (@temp) + { + @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); + print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; + } + } + if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { print CONF "client-to-client\n"; } @@ -410,7 +429,29 @@ sub validdotmask if (($mask =~ /\./ )) { return 0; } return 1; } - + +# ------------------------------------------------------------------- + +sub write_routepushfile +{ + open(FILE, ">$routes_push_file"); + flock(FILE, 2); + if ($vpnsettings{'ROUTES_PUSH'} ne '') { + print FILE $vpnsettings{'ROUTES_PUSH'}; + } + close(FILE); +} + +sub read_routepushfile +{ + if (-e "$routes_push_file") { + open(FILE,"$routes_push_file"); + delete $vpnsettings{'ROUTES_PUSH'}; + while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ }; + close(FILE); + $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'}; + } +} #hier die refresh page @@ -473,6 +514,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_DOMAIN'} = $cgiparams{'DHCP_DOMAIN'}; $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; + $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; + my @temp=(); if ($cgiparams{'FRAGMENT'} eq '') { delete $vpnsettings{'FRAGMENT'}; @@ -504,8 +547,31 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { if ($cgiparams{'DHCP_WINS'} ne ''){ unless (&General::validfqdn($cgiparams{'DHCP_WINS'}) || &General::validip($cgiparams{'DHCP_WINS'})) { $errormessage = $Lang::tr{'invalid input for dhcp wins'}; - goto ADV_ERROR; + goto ADV_ERROR; + } + } + if ($cgiparams{'ROUTES_PUSH'} ne ''){ + @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'}); + undef $vpnsettings{'ROUTES_PUSH'}; + foreach (@temp) + { + s/^\s+//g; s/\s+$//g; + if ($_) + { + unless (&General::validipandmask($_)) { + $errormessage = $Lang::tr{'ovpn errmsg invalid ip or mask'}; + goto ADV_ERROR; + } + my ($ip, $cidr) = split("\/",&General::ipcidr2msk($_)); + if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) { + $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; + goto ADV_ERROR; + } + $vpnsettings{'ROUTES_PUSH'} .= $_."\n"; + } } + &write_routepushfile; + undef $vpnsettings{'ROUTES_PUSH'}; } if ((length($cgiparams{'MAX_CLIENTS'}) == 0) || (($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) { $errormessage = $Lang::tr{'invalid input for max clients'}; @@ -541,7 +607,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'}); my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); -my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; +my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; my $tunmtu = ''; unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} @@ -564,7 +630,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# IP adresses of the VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; print SERVERCONF "# Client Gateway Network\n"; - print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; + print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n"; print SERVERCONF "# tun Device\n"; print SERVERCONF "dev tun\n"; print SERVERCONF "# Port and Protokol\n"; @@ -582,10 +648,9 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} - if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n";} + if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; } - print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; @@ -606,7 +671,8 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; print SERVERCONF "# Activate Management Interface and Port\n"; - print SERVERCONF "#management localhost 4711\n"; + if ($cgiparams{'OVPN_MGMT'} eq '') {print SERVERCONF "management localhost $cgiparams{'DEST_PORT'}\n"} + else {print SERVERCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"}; close(SERVERCONF); } @@ -618,10 +684,10 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client') { my @ovsubnettemp = split(/\./,$cgiparams{'OVPN_SUBNET'}); - my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; + my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'}); my $tunmtu = ''; - + unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} @@ -642,7 +708,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "# Server Gateway Network\n"; - print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; + print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev tun\n"; print CLIENTCONF "# Port and Protokol\n"; @@ -653,7 +719,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; - print CLIENTCONF "ns-cert-type server\n"; } if ($cgiparams{'PROTOCOL'} eq 'udp') { @@ -661,10 +726,11 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} - if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n";} + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; } - + + print CLIENTCONF "ns-cert-type server\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; @@ -682,7 +748,8 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; print CLIENTCONF "# Activate Management Interface and Port\n"; - print CLIENTCONF "# management localhost 4711\n"; + if ($cgiparams{'OVPN_MGMT'} eq '') {print CLIENTCONF "management localhost $cgiparams{'DEST_PORT'}\n"} + else {print CLIENTCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"}; close(CLIENTCONF); } @@ -1549,9 +1616,10 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ my $zippathname = "$zippath$zipname"; $clientovpn = "$confighash{$cgiparams{'KEY'}}[1].conf"; my @ovsubnettemp = split(/\./,$confighash{$cgiparams{'KEY'}}[27]); - my $ovsubnet = "@ovsubnettemp[0].@ovsubnettemp[1].@ovsubnettemp[2]"; + my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; my $tunmtu = ''; my @remsubnet = split(/\//,$confighash{$cgiparams{'KEY'}}[8]); + my $n2nfragment = ''; open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; @@ -1582,7 +1650,6 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; - print CLIENTCONF "ns-cert-type server\n"; } if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { @@ -1590,10 +1657,10 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "# Paketsize\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($confighash{$cgiparams{'KEY'}}[24] ne '') {print CLIENTCONF "fragment $confighash{$cgiparams{'KEY'}}[24]\n";} if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} } - + print CLIENTCONF "ns-cert-type server\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; @@ -1614,7 +1681,8 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; print CLIENTCONF "# Activate Management Interface and Port\n"; - print CLIENTCONF "# management localhost 4711\n"; + if ($confighash{$cgiparams{'KEY'}}[22] eq '') {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[29]\n"} + else {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[22]\n"}; print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; @@ -1812,6 +1880,7 @@ else %cahash = (); %confighash = (); &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); + read_routepushfile; # if ($cgiparams{'CLIENT2CLIENT'} eq '') { # $cgiparams{'CLIENT2CLIENT'} = 'on'; @@ -1886,6 +1955,25 @@ ADV_ERROR: <tr> <td class='base'>WINS</td> <td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' /></td> + </tr> + <tr> + <td colspan='4'><b>$Lang::tr{'ovpn routes push options'}</b></td> + </tr> + <tr> + <td class='base'>$Lang::tr{'ovpn routes push'}</td> + <td colspan='2'> + <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'> +END +; + +if ($cgiparams{'ROUTES_PUSH'} ne '') +{ + print $cgiparams{'ROUTES_PUSH'}; +} + +print <<END +</textarea></td> +</tr> </tr> </table> <hr size='1'> @@ -2200,7 +2288,12 @@ if ( -s "${General::swroot}/ovpn/settings") { <tr><td><input type='radio' name='TYPE' value='net2net' /></td> <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> - <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'><td class='base'>Default : Client Packagename</td></td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td> </td></tr> + <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </form></table> END ; @@ -2231,11 +2324,14 @@ END my @firen2nconf; my @confdetails; my $uplconffilename =''; + my $uplconffilename2 =''; my $uplp12name = ''; + my $uplp12name2 = ''; my @rem_subnet; my @rem_subnet2; my @tmposupnet3; my $key; + my @n2nname; &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -2299,14 +2395,38 @@ END ### # m.a.d net2net ### + + if ($cgiparams{'n2nname'} ne ''){ + + $uplconffilename2 = "$cgiparams{'n2nname'}.conf"; + $uplp12name2 = "$cgiparams{'n2nname'}.p12"; + $n2nname[0] = $cgiparams{'n2nname'}; + my @n2nname2 = split(/\./,$uplconffilename); + $n2nname2[0] =~ s/\n|\r//g; + my $input1 = "${General::swroot}/ovpn/certs/$uplp12name"; + my $output1 = "${General::swroot}/ovpn/certs/$uplp12name2"; + my $input2 = "$n2nname2[0]n2n"; + my $output2 = "$n2nname[0]n2n"; + my $filename = "$tempdir/$uplconffilename"; + open(FILE, "< $filename") or die 'Unable to open config file.'; + my @current = <FILE>; + close(FILE); + foreach (@current) {s/$input1/$output1/g;} + foreach (@current) {s/$input2/$output2/g;} + open (OUT, "> $filename") || die 'Unable to open config file.'; + print OUT @current; + close OUT; - my @n2nname = split(/\./,$uplconffilename); + }else{ + $uplconffilename2 = $uplconffilename; + $uplp12name2 = $uplp12name; + @n2nname = split(/\./,$uplconffilename); $n2nname[0] =~ s/\n|\r//g; - + } unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} - move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename"); + move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2"); if ($? ne 0) { $errormessage = "*.conf move failed: $!"; @@ -2314,7 +2434,7 @@ END goto N2N_ERROR; } - move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name"); + move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name2"); chmod 0600, "${General::swroot}/ovpn/certs/$uplp12name"; if ($? ne 0) { @@ -2327,18 +2447,20 @@ my $complzoactive; my $mssfixactive; my $n2nfragment; my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); -my @n2nproto = split(/-/, @n2nproto2[1]); +my @n2nproto = split(/-/, $n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; if ($n2ncomplzo[0] =~ /comp-lzo/){$complzoactive = "on";} else {$complzoactive = "off";} my @n2nmssfix = grep { /^mssfix/ } @firen2nconf; if ($n2nmssfix[0] =~ /mssfix/){$mssfixactive = "on";} else {$mssfixactive = "off";} +#my @n2nmssfix = split(/ /, (grep { /^mssfix/ } @firen2nconf)[0]); my @n2nfragment = split(/ /, (grep { /^fragment/ } @firen2nconf)[0]); my @n2nremote = split(/ /, (grep { /^remote/ } @firen2nconf)[0]); my @n2novpnsuball = split(/ /, (grep { /^ifconfig/ } @firen2nconf)[0]); my @n2novpnsub = split(/\./,$n2novpnsuball[1]); my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]); +my @n2nmgmt = split(/ /, (grep { /^management/ } @firen2nconf)[0]); my @n2nlocalsub = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]); @@ -2357,6 +2479,7 @@ $n2nremsub[1] =~ s/\n|\r//g; $n2nremsub[2] =~ s/\n|\r//g; $n2nlocalsub[2] =~ s/\n|\r//g; $n2nfragment[1] =~ s/\n|\r//g; +$n2nmgmt[2] =~ s/\n|\r//g; chomp ($complzoactive); chomp ($mssfixactive); @@ -2420,7 +2543,8 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[8] = $n2nlocalsub[2]; $confighash{$key}[10] = $n2nremote[1]; $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; - $confighash{$key}[23] = $mssfixactive; + $confighash{$key}[22] = $n2nmgmt[2]; + $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; @@ -2466,6 +2590,7 @@ foreach my $dkey (keys %confighash) { <tr><td class='boldbase' nowrap='nowrap'>MSSFIX </td><td><b>$confighash{$key}[23]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>Fragment </td><td><b>$confighash{$key}[24]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr> <tr><td> </td><td> </td></tr> </table> END @@ -2546,6 +2671,7 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; # n2n m.a.d new fields + $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; @@ -2612,6 +2738,13 @@ if ($cgiparams{'TYPE'} eq 'net') { rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } + + if ($cgiparams{'DEST_PORT'} eq '') { + $errormessage = $Lang::tr{'openvpn destination port used'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { $errormessage = $Lang::tr{'openvpn subnet is used'}; @@ -2654,6 +2787,11 @@ if ($cgiparams{'TYPE'} eq 'net') { rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } + + if ($cgiparams{'OVPN_MGMT'} eq '') { + $cgiparams{'OVPN_MGMT'} = $cgiparams{'DEST_PORT'}; + } + } # if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { @@ -3023,6 +3161,11 @@ if ($cgiparams{'TYPE'} eq 'net') { } $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; + if ($cgiparams{'OVPN_MGMT'} eq '') { + $confighash{$key}[22] = $confighash{$key}[29]; + } else { + $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; + } $confighash{$key}[23] = $cgiparams{'MSSFIX'}; $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; $confighash{$key}[25] = $cgiparams{'REMARK'}; @@ -3069,6 +3212,14 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_END; } else { $cgiparams{'ENABLED'} = 'on'; +### +# m.a.d n2n begin +### + $cgiparams{'MSSFIX'} = 'on'; + $cgiparams{'FRAGMENT'} = '1300'; +### +# m.a.d n2n end +### $cgiparams{'SIDE'} = 'left'; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cgiparams{'AUTH'} = 'psk'; @@ -3204,13 +3355,19 @@ if ($cgiparams{'TYPE'} eq 'net') { <tr><td class='boldbase' nowrap='nowrap'>mssfix  <img src='/blob.gif' /></td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> - - <tr><td class='boldbase' nowrap='nowrap'>fragment  <img src='/blob.gif' /></td> + <td>$Lang::tr{'openvpn default'}: <span class="base">on</span></td> + + <tr><td class='boldbase' nowrap='nowrap'>fragment  <img src='/blob.gif' /></td> <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td> <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} <img src='/blob.gif' /></td> - <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD> + <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></td> + <td colspan='2'>$Lang::tr{'openvpn default'}: udp/tcp <span class="base">1500/1400</span></td> + + <tr><td class='boldbase' nowrap='nowrap'>Management Port <img src='/blob.gif' /></td> + <td> <input type='TEXT' name='OVPN_MGMT' VALUE='$cgiparams{'OVPN_MGMT'}'size='5' /></td> + <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td> END ; @@ -3260,10 +3417,12 @@ END print <<END <table width='100%' cellpadding='0' cellspacing='5' border='0'> - <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' border='0' /></td></tr> + <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td><td class='base'>$Lang::tr{'upload a certificate request'}</td><td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr> <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td><td class='base'>$Lang::tr{'upload a certificate'}</td></tr> - <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' BORDER='0' /></td></tr> + <tr><td colspan='3'> </td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td colspan='3'> </td></tr> <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr> <tr><td> </td><td class='base'>$Lang::tr{'users fullname or system hostname'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'users email'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr> @@ -3292,7 +3451,8 @@ print <<END <tr><td> </td><td class='base'>$Lang::tr{'city'}: <img src='/blob.gif'></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'state or province'}: <img src='/blob.gif' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'country'}:</td><td class='base'><select name='CERT_COUNTRY' $cakeydisabled> - + + END ; @@ -3317,13 +3477,16 @@ if ($cgiparams{'TYPE'} eq 'host') { print <<END </select></td></tr> - <td class='base'>$Lang::tr{'valid till'} (days):</td> + <td> </td><td class='base'>$Lang::tr{'valid till'} (days):</td> <td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td> <td class='base'>$Lang::tr{'pkcs12 file password'}:</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td> <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr> + <tr><td colspan='3'> </td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </table> END }else{ @@ -3331,6 +3494,8 @@ END </select></td></tr> <tr><td> </td><td> </td><td> </td></tr> <tr><td> </td><td> </td><td> </td></tr> + <tr><td colspan='3'><hr /></td></tr> + <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </table> END @@ -3683,6 +3848,7 @@ END ### # m.a.d net2net +#<td width='25%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td> ### &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' }); @@ -3694,8 +3860,8 @@ END <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td> <td width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td> <td width='18%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td> - <td width='17%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td> - <td width='25%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td> + <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td> + <td width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td> <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td> </tr> @@ -3727,7 +3893,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; if ($confighash{$key}[0] eq 'off') { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn disabled'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; } else { ### @@ -3735,24 +3901,36 @@ END ### if ($confighash{$key}[3] eq 'net') { -# my @tempovpnsubnet = split("\/",$confighash{$key}[27]); -# my @ovpnip = split /\./,$tempovpnsubnet[0]; -# my $pingip = ""; -# if ($confighash{$key}[6] eq 'server') { -# $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].2"; -# } else { -# $pingip = "$ovpnip[0].$ovpnip[1].$ovpnip[2].1"; -# } -# my $p = Net::Ping->new("udp",1); -# if ($p->ping($pingip)) { -# $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; -# } -# $p->close(); - - if (-e "/var/run/$confighash{$key}[1]n2n.pid") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn enabled'}</font></b></td></tr></table>"; - } - } + + if (-e "/var/run/$confighash{$key}[1]n2n.pid") { + my @output = ""; + my @tustate = ""; + my $tport = $confighash{$key}[22]; + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + if ($tport ne '') { + $tnet->open('127.0.0.1'); + @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + @tustate = split(/\,/, $output[1]); +### +#CONNECTING -- OpenVPN's initial state. +#WAIT -- (Client only) Waiting for initial response from server. +#AUTH -- (Client only) Authenticating with server. +#GET_CONFIG -- (Client only) Downloading configuration options from server. +#ASSIGN_IP -- Assigning IP address to virtual network interface. +#ADD_ROUTES -- Adding routes to system. +#CONNECTED -- Initialization Sequence Completed. +#RECONNECTING -- A restart has occurred. +#EXITING -- A graceful exit is in progress. +#### + + if ( $tustate[1] eq 'CONNECTED') { + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></tr></td></table>"; + } else { + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$tustate[1]</font></b></td></tr></table>"; + } + } + } + } else { my $cn; my @match = (); @@ -3767,7 +3945,7 @@ END if ($cn eq "$confighash{$key}[2]") { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } - + } } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 727470f..a47c9f7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1367,6 +1367,10 @@ 'ovpn_processprioVH' => 'Sehr Hoch', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', +'ovpn routes push options' => 'Route push Optionen', +'ovpn routes push' => 'Routen', +'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', +'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', diff --git a/lfs/Net-Telnet b/lfs/Net-Telnet new file mode 100644 index 0000000..8d911f8 --- /dev/null +++ b/lfs/Net-Telnet @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 = 3.03 + +THISAPP = Net-Telnet-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2f7d34b09d6117baefe89d44cff9d5fc + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 18b986e..a720b62 100755 --- a/make.sh +++ b/make.sh @@ -572,6 +572,7 @@ buildipfire() { ipfiremake Locale-Country ipfiremake XML-Parser ipfiremake Crypt-PasswdMD5 + ipfiremake Net-Telnet ipfiremake python-setuptools ipfiremake python-clientform ipfiremake python-mechanize hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 650a4d8097023cc6e8f54d86db377e756a29c07c
by git＠ipfire.org 06 Mar '12

06 Mar '12

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 650a4d8097023cc6e8f54d86db377e756a29c07c (commit) via 9e7e1c143d874e713725c77444cadd734b131047 (commit) via 25057c911bfd2972df3d12d6e0d6f1c8f2af0294 (commit) via aba19c3022093d3e3f187707cd810a1b417a1cc6 (commit) from eb12fca108f40e1b66f05c2291565530050a7724 (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 650a4d8097023cc6e8f54d86db377e756a29c07c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 6 22:26:22 2012 +0100 Add libpng update to core update 58. commit 9e7e1c143d874e713725c77444cadd734b131047 Merge: 25057c9 aba19c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 6 22:24:28 2012 +0100 Merge branch 'libpng-update' into next commit 25057c911bfd2972df3d12d6e0d6f1c8f2af0294 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 6 22:23:29 2012 +0100 Open core update 58 and import changes that were already commited. commit aba19c3022093d3e3f187707cd810a1b417a1cc6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 4 11:17:22 2012 +0100 libpng: Update to 1.2.46. Fixes several security issues from 2011. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libpng | 4 ++-- config/rootfiles/core/{55 => 58}/exclude | 0 config/rootfiles/core/{55 => 58}/filelists/files | 1 + .../{oldcore/39 => core/58}/filelists/libpng | 0 config/rootfiles/core/{53 => 58}/filelists/openvpn | 0 .../rootfiles/core/{53 => 58}/filelists/strongswan | 0 config/rootfiles/core/{52 => 58}/meta | 0 config/rootfiles/core/{57 => 58}/update.sh | 8 ++------ lfs/libpng | 8 ++++---- make.sh | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-) copy config/rootfiles/core/{55 => 58}/exclude (100%) copy config/rootfiles/core/{55 => 58}/filelists/files (74%) copy config/rootfiles/{oldcore/39 => core/58}/filelists/libpng (100%) copy config/rootfiles/core/{53 => 58}/filelists/openvpn (100%) copy config/rootfiles/core/{53 => 58}/filelists/strongswan (100%) copy config/rootfiles/core/{52 => 58}/meta (100%) copy config/rootfiles/core/{57 => 58}/update.sh (94%) Difference in files: diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng index 2b2ab10..c29eaa7 100644 --- a/config/rootfiles/common/libpng +++ b/config/rootfiles/common/libpng @@ -9,12 +9,12 @@ #usr/lib/libpng.la usr/lib/libpng.so usr/lib/libpng.so.3 -usr/lib/libpng.so.3.44.0 +usr/lib/libpng.so.3.46.0 #usr/lib/libpng12.a #usr/lib/libpng12.la usr/lib/libpng12.so usr/lib/libpng12.so.0 -usr/lib/libpng12.so.0.44.0 +usr/lib/libpng12.so.0.46.0 #usr/lib/pkgconfig/libpng.pc #usr/lib/pkgconfig/libpng12.pc #usr/share/man/man3/libpng.3 diff --git a/config/rootfiles/core/58/exclude b/config/rootfiles/core/58/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/58/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files new file mode 100644 index 0000000..afb3d99 --- /dev/null +++ b/config/rootfiles/core/58/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +etc/vimrc diff --git a/config/rootfiles/core/58/filelists/libpng b/config/rootfiles/core/58/filelists/libpng new file mode 120000 index 0000000..8ef96e2 --- /dev/null +++ b/config/rootfiles/core/58/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/openvpn b/config/rootfiles/core/58/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/58/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/58/filelists/strongswan b/config/rootfiles/core/58/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/58/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/58/meta b/config/rootfiles/core/58/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/58/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/58/update.sh b/config/rootfiles/core/58/update.sh new file mode 100644 index 0000000..d05fb84 --- /dev/null +++ b/config/rootfiles/core/58/update.sh @@ -0,0 +1,77 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=58 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/ipsec stop + +# +#Extract files +extract_files + +# +#Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +#depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +#depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/lfs/libpng b/lfs/libpng index 60b25a0..7075118 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -24,10 +24,10 @@ include Config -VER = 1.2.44 +VER = 1.2.46 THISAPP = libpng-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 098ab673ab74015978db98667febc4a9 +$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22 install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index 598681d..18b986e 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="57" # Core Level (Filename) +CORE="58" # Core Level (Filename) PAKFIRE_CORE="57" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. d5c0c77877b512ac0e19517818a95893cb436fa7
by git＠ipfire.org 05 Mar '12

05 Mar '12

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, kernel-update has been updated via d5c0c77877b512ac0e19517818a95893cb436fa7 (commit) from 430fb015456b4b3802dcd0c6a191d5646816b9bb (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 d5c0c77877b512ac0e19517818a95893cb436fa7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 5 15:48:50 2012 +0100 kernel: update to 2.6.32.58. ----------------------------------------------------------------------- Summary of changes: lfs/linux | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index f79dc5a..042d096 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .57 -VER = 2.6.32.57 +PATCHLEVEL = .58 +VER = 2.6.32.58 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -82,7 +82,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 8342c94dface1fe9774b961286f6e92a +$(DL_FILE)_MD5 = 13fd1dec69337dd47eef3a1870c20314 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e3642ca4cac087f13b2e85596dc967070c395a10
by git＠ipfire.org 04 Mar '12

04 Mar '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0e13ce8c822b86aff34bcf415cea8b462ceab292
by git＠ipfire.org 04 Mar '12

04 Mar '12

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 3.x development tree". The branch, master has been updated via 0e13ce8c822b86aff34bcf415cea8b462ceab292 (commit) via 56979ad26542fa49ea7ae053cc3b89766a1b0a58 (commit) from 3d10b5cd31eb3a8592eb0470a0631f689a253d14 (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 0e13ce8c822b86aff34bcf415cea8b462ceab292 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 4 21:13:07 2012 +0100 bash: Run scriptlet after the transaction is doen. In some occasions the dependency cycle was broken at the wrong place and in fact, it is hard to break that correctly. I think we can wait for /etc/shells filled with all the shells we do have until the end of the transaction. commit 56979ad26542fa49ea7ae053cc3b89766a1b0a58 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 4 21:12:36 2012 +0100 gdb: Remove even more files provided by binutils. ----------------------------------------------------------------------- Summary of changes: bash/bash.nm | 4 ++-- gdb/gdb.nm | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/bash/bash.nm b/bash/bash.nm index bc5364c..f2a57a2 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -5,7 +5,7 @@ name = bash version = 4.2 -release = 5 +release = 6 groups = System/Tools url = http://www.gnu.org/software/bash/ @@ -75,7 +75,7 @@ packages /etc/profile end - script postin + script posttransin # Create /etc/shells, if it does not exist. [ -f "/etc/shells" ] || touch /etc/shells diff --git a/gdb/gdb.nm b/gdb/gdb.nm index 00ad491..1053853 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -5,7 +5,7 @@ name = gdb version = 7.3.50.20110722 -release = 2 +release = 3 groups = Development/Debuggers url = http://gnu.org/software/gdb/ @@ -70,8 +70,9 @@ build mkdir -pv %{BUILDROOT}/etc/gdbinit.d cp -vf %{DIR_SOURCE}/gdbinit %{BUILDROOT}/etc/gdbinit - # Remove locale data which is provided by binutils. + # Remove locale data and headers which is provided by binutils. rm -rf %{BUILDROOT}%{datadir}/locale/ + rm -rf %{BUILDROOT}%{includedir}/{ansidecl,bfd,bfdlink,dis-asm,symcat}.h end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3d10b5cd31eb3a8592eb0470a0631f689a253d14
by git＠ipfire.org 04 Mar '12

04 Mar '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dc22ea774c782d6e861f65d82a38e8f5f3146986
by git＠ipfire.org 04 Mar '12

04 Mar '12

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 3.x development tree". The branch, master has been updated via dc22ea774c782d6e861f65d82a38e8f5f3146986 (commit) from b16bc1c5eac76a953f3ff78ee6b1af0f6db34a05 (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 dc22ea774c782d6e861f65d82a38e8f5f3146986 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 4 20:24:45 2012 +0100 grub: Enable support for x86_64. Also EFI. ----------------------------------------------------------------------- Summary of changes: grub/grub.nm | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 9 deletions(-) Difference in files: diff --git a/grub/grub.nm b/grub/grub.nm index cea1a68..feb62ba 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,8 +5,8 @@ name = grub version = 1.99 -release = 3 -sup_arches = i686 +release = 4 +sup_arches = x86_64 i686 groups = System/Boot url = http://www.gnu.org/software/grub/ @@ -14,9 +14,9 @@ license = GPLv2+ summary = Grand Unified Boot Loader. description - GRUB (Grand Unified Boot Loader) is an experimental boot loader \ - capable of booting into most free operating systems - Linux, FreeBSD, \ - NetBSD, GNU Mach, and others as well as most commercial operating \ + GRUB (Grand Unified Boot Loader) is an experimental boot loader + capable of booting into most free operating systems - Linux, FreeBSD, + NetBSD, GNU Mach, and others as well as most commercial operating systems. end @@ -25,27 +25,71 @@ source_dl = http://ftp.gnu.org/gnu/grub/ build requires autoconf + autogen automake bison flex freetype-devel gettext + libdevmapper-devel ncurses-devel zlib-devel end # Can only use very basic CFLAGS. - export CFLAGS = -O2 -pipe + export CFLAGS = -Os -pipe export CXXFLAGS = %{CFLAGS} + prepare_cmds + # Replace pkglib_DATA (automake 1.11.2 incompatibility) + sed -i -e "s/pkglib_DATA/pkgdata_DATA/g" \ + -e "s/pkglib_SCRIPTS/pkgdata_SCRIPTS/g" \ + Makefile.am conf/Makefile.common \ + gentpl.py util/grub-*.in + + ./autogen.sh + + # Create a copy of the source tree to build + # an EFI enabled version of grub. + cp -R . %{DIR_SRC}/%{thisapp}-efi + end + configure_options += \ - --sysconfdir=/etc \ --sbindir=/sbin \ --with-platform=pc - install + build_cmds + cd ../%{thisapp}-efi + #./autogen.sh + ./configure %{configure_options} \ + --with-platform=efi \ + --program-transform-name=s,grub,grub-efi, + make %{PARALLELISMFLAGS} + + ./grub-mkimage \ + -O i386-efi \ + -p /EFI/%{DISTRO_SNAME}/grub-efi \ + -o grub.efi \ + -d grub-core part_gpt hfsplus fat ext2 btrfs normal chain \ + boot configfile linux appleldr minicmd loadbios reboot halt \ + search font gfxterm echo video efi_gop efi_uga + end + + install_cmds + cd ../%{thisapp}-efi make install DESTDIR=%{BUILDROOT} + mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi} + mv -v %{BUILDROOT}/usr/lib/grub{,-efi} + sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \ + -i %{BUILDROOT}/sbin/grub-efi-mkconfig + + install -m 755 -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/ + install -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi + touch %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg + ln -svf ../boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg %{BUILDROOT}/etc/grub-efi.cfg + install -m 755 grub.efi %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.efi + # Install theme file install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/ @@ -81,7 +125,30 @@ packages # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters script postin /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \ - --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz + --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \ + /usr/share/X11/fonts/misc/unifont.pcf.gz + end + end + + package %{name}-efi + description + EFI version of GRUB, the Grand Unified Boot Loader. + end + summary = %{description} + + requires += grub = %{thisver} + + configfiles + /boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg + end + + files + /boot/efi + /etc/bash_completion.d/grub-efi + /etc/grub-efi.cfg + /sbin/grub-efi-* + /usr/bin/grub-efi-* + /usr/lib/grub-efi end end hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2012