IPFire-SCM July 2013

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d43bb759b1bb6d02a93b63d0dfd82e623685fb21
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 d43bb759b1bb6d02a93b63d0dfd82e623685fb21 (commit) from 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa (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 d43bb759b1bb6d02a93b63d0dfd82e623685fb21 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 8 22:32:42 2013 +0200 functions.network: cleanup dhcp stop script. ----------------------------------------------------------------------- Summary of changes: .../init.d/networking/functions.network | 49 +++++++++------------- src/initscripts/init.d/networking/red | 0 .../init.d/networking/wpa_supplicant.exe | 0 src/initscripts/init.d/wlanclient | 0 4 files changed, 20 insertions(+), 29 deletions(-) mode change 100755 => 100644 src/initscripts/init.d/networking/functions.network mode change 100755 => 100644 src/initscripts/init.d/networking/red mode change 100755 => 100644 src/initscripts/init.d/networking/wpa_supplicant.exe mode change 100755 => 100644 src/initscripts/init.d/wlanclient Difference in files: diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network old mode 100755 new mode 100644 index b1ce220..d52b301 --- a/src/initscripts/init.d/networking/functions.network +++ b/src/initscripts/init.d/networking/functions.network @@ -123,34 +123,25 @@ dhcpcd_stop() { exit 1 fi - # Check if we got a valid lease. - if [ -e $leaseinfo ]; then - . $leaseinfo - if [ "$dchp_lease_time" = "4294967295" ]; then - # do nothing, just echo ok - echo_ok - else - # Stop dhcpcd. - /sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null - ret="$?" - - # Wait until dhcpd has stopped. - while [ -d "/proc/${pid}" ]; do - sleep 1 - done - - # Display console message, depended on the exit code - # of the stopped dhcpcd. - if [ "${ret}" -eq 0 ]; then - boot_mesg - echo_ok - elif [ "${ret}" -eq 1 ]; then - boot_mesg "failed to stop dhcpcd!" ${WARNING} - echo_warning - else - boot_mesg - echo_failure - fi - fi + # Stop dhcpcd. + /sbin/dhcpcd "${device}" "${dhcp_stop}" &> /dev/null + ret="$?" + + # Wait until dhcpd has stopped. + while [ -d "/proc/${pid}" ]; do + sleep 1 + done + + # Display console message, depended on the exit code + # of the stopped dhcpcd. + if [ "${ret}" -eq 0 ]; then + boot_mesg + echo_ok + elif [ "${ret}" -eq 1 ]; then + boot_mesg "failed to stop dhcpcd!" ${WARNING} + echo_warning + else + boot_mesg + echo_failure fi } diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red old mode 100755 new mode 100644 diff --git a/src/initscripts/init.d/networking/wpa_supplicant.exe b/src/initscripts/init.d/networking/wpa_supplicant.exe old mode 100755 new mode 100644 diff --git a/src/initscripts/init.d/wlanclient b/src/initscripts/init.d/wlanclient old mode 100755 new mode 100644 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c955da5a71e3b553d83c4cd304149b06d791a5e4
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 c955da5a71e3b553d83c4cd304149b06d791a5e4 (commit) from f1561badd0b8b780ca96111a8582be957806011d (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 c955da5a71e3b553d83c4cd304149b06d791a5e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 8 21:34:27 2013 +0200 gnutls: Add patch to fix pem-decoding error in testsuite. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 2 +- gnutls/patches/gnutls-3.2.1-pem-decoding.patch | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnutls/patches/gnutls-3.2.1-pem-decoding.patch Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 070a7fc..9d1f727 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -7,7 +7,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.2 ver_min = 1 -release = 1.1 +release = 1.2 groups = System/Libraries url = http://www.gnu.org/software/gnutls/ diff --git a/gnutls/patches/gnutls-3.2.1-pem-decoding.patch b/gnutls/patches/gnutls-3.2.1-pem-decoding.patch new file mode 100644 index 0000000..2764f8b --- /dev/null +++ b/gnutls/patches/gnutls-3.2.1-pem-decoding.patch @@ -0,0 +1,35 @@ +From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos <nmav(a)gnutls.org> +Date: Sun, 2 Jun 2013 12:10:06 +0200 +Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. + +--- + tests/cert-tests/pem-decoding | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding +index fe769ec..f8c6372 100755 +--- a/tests/cert-tests/pem-decoding ++++ b/tests/cert-tests/pem-decoding +@@ -61,7 +61,9 @@ if test "$rc" != "0"; then + exit $rc + fi + +-diff $srcdir/complex-cert.pem tmp-pem.pem ++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 ++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 ++diff tmp1 tmp2 + rc=$? + + if test "$rc" != "0"; then +@@ -69,6 +71,6 @@ if test "$rc" != "0"; then + exit $rc + fi + +-rm -f tmp-pem.pem ++rm -f tmp-pem.pem tmp1 tmp2 + + exit 0 +-- +1.7.1 + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f1561badd0b8b780ca96111a8582be957806011d
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 f1561badd0b8b780ca96111a8582be957806011d (commit) from 576ea568f5563ff1b56e8b297d1f3cbd3a45c0f4 (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 f1561badd0b8b780ca96111a8582be957806011d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 8 20:59:13 2013 +0200 icecream: Update to 1.0.0. The old version does not compile with gcc 4.8. ----------------------------------------------------------------------- Summary of changes: icecream/icecream.nm | 31 ++----- icecream/patches/icecream-cleanup-conffile.patch0 | 100 -------------------- icecream/patches/icecream-rename-scheduler.patch | 107 ---------------------- 3 files changed, 8 insertions(+), 230 deletions(-) delete mode 100644 icecream/patches/icecream-cleanup-conffile.patch0 delete mode 100644 icecream/patches/icecream-rename-scheduler.patch Difference in files: diff --git a/icecream/icecream.nm b/icecream/icecream.nm index 9c63e61..7a5b4ff 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -4,8 +4,8 @@ ############################################################################### name = icecream -version = 0.9.7 -release = 3 +version = 1.0.0 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -24,9 +24,7 @@ description end source_dl = ftp://ftp.suse.com/pub/projects/icecream/ -sources = \ - icecc-%{version}.tar.bz2 \ - icecream-manpages.tar.bz2 +sources = icecc-%{version}.tar.bz2 build requires @@ -39,35 +37,22 @@ build --disable-static \ --enable-shared - prepare - cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/icecc-%{version}.tar.bz2 - cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/icecream-manpages.tar.bz2 - - %{MACRO_PATCHES} - end - install_cmds mkdir -pv %{BUILDROOT}%{libdir}/icecc/bin for i in gcc g++ cc c++; do - ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/${i} - ln -svf ../../../bin/icecc %{BUILDROOT}%{libdir}/icecc/bin/%{DISTRO_BUILDTARGET}-${i} + ln -svf ../../../bin/icecc %{BUILDROOT}%{prefix}/lib/icecc/bin/${i} + ln -svf ../../../bin/icecc %{BUILDROOT}%{prefix}/lib/icecc/bin/%{DISTRO_BUILDTARGET}-${i} done - sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{libdir}/icecc/icecc-create-env + ln -svf icecc %{BUILDROOT}%{bindir}/icerun + sed -e 's|^#!.*|#!/bin/bash|' -i %{BUILDROOT}%{prefix}/lib/icecc/icecc-create-env mkdir -pv %{BUILDROOT}/etc/profile.d - sed -e "s|@LIBDIR@|%{libdir}|g" \ + sed -e "s|@LIBDIR@|%{prefix}/lib|g" \ < %{DIR_SOURCE}/icecream.sh > %{BUILDROOT}/etc/profile.d/icecream.sh # create default working dir mkdir -pv %{BUILDROOT}/var/cache/icecream - # install manpages - mkdir -pv %{BUILDROOT}/usr/share/man/man{1,7,8} - mv mans/scheduler.1 mans/icecc-scheduler.1 - for i in mans/*.1 mans/*.7; do - install -m 644 $i %{BUILDROOT}/usr/share/man/man${i##*.} - done - # Remove unwanted symlinks. rm -rvf %{BUILDROOT}/usr/bin/c++ rm -rvf %{BUILDROOT}/usr/bin/cc diff --git a/icecream/patches/icecream-cleanup-conffile.patch0 b/icecream/patches/icecream-cleanup-conffile.patch0 deleted file mode 100644 index 7bf7c9d..0000000 --- a/icecream/patches/icecream-cleanup-conffile.patch0 +++ /dev/null @@ -1,100 +0,0 @@ ---- suse/sysconfig.icecream.orig 2007-04-12 10:02:33.000000000 +0200 -+++ suse/sysconfig.icecream 2007-07-17 15:50:39.000000000 +0200 -@@ -1,69 +1,34 @@ - # --## Type: integer(0:19) --## Path: Applications/icecream --## Description: Icecream settings --## ServiceRestart: icecream --## Default: 5 --# - # Nice level of running compilers - # - ICECREAM_NICE_LEVEL="5" - - # --## Type: string --## Path: Applications/icecream --## Defaut: /var/log/iceccd --# - # icecream daemon log file - # - ICECREAM_LOG_FILE="/var/log/iceccd" - - # --## Type: string --## Path: Applications/icecream --## Defaut: no --# --# Start also the scheduler? --# --ICECREAM_RUN_SCHEDULER="no" -- --# --## Type: string --## Path: Applications/icecream --## Defaut: /var/log/icecc_scheduler --# - # icecream scheduler log file - # --ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler" -+ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc-scheduler" - - # --## Type: string --## Path: Applications/icecream --## Defaut: "" --# --# Identification for the network the scheduler and daemon run on. -+# Identification for the network the scheduler and daemon run on. - # You can have several distinct icecream networks in the same LAN - # for whatever reason. - # - ICECREAM_NETNAME="" - - # --## Type: string --## Path: Applications/icecream --## Defaut: "" --# --# If the daemon can't find the scheduler by broadcast (e.g. because -+# If the daemon can't find the scheduler by broadcast (e.g. because - # of a firewall) you can specify it. - # - ICECREAM_SCHEDULER_HOST="" - - # --## Type: integer --## Path: Applications/icecream --## Defaut: "" --# - # You can overwrite here the number of jobs to run in parallel. Per --# default this depends on the number of (virtual) CPUs installed. -+# default this depends on the number of (virtual) CPUs installed. - # - # Note: a value of "0" is actually interpreted as "1", however it - # also sets ICECREAM_ALLOW_REMOTE="no". -@@ -71,22 +36,14 @@ ICECREAM_SCHEDULER_HOST="" - ICECREAM_MAX_JOBS="" - - # --## Type: yesno --## Path: Applications/icecream --## Defaut: "yes" --# - # Specifies whether jobs submitted by other nodes are allowed to run on - # this one. - # - ICECREAM_ALLOW_REMOTE="yes" - - # --## Type: string --## Path: Applications/icecream --## Default: "/var/cache/icecream" --# - # This is the directory where the icecream daemon stores the environments - # it compiles in. In a big network this can grow quite a bit, so use some - # path if your /tmp is small - but the user icecream has to write to it. --# -+# - ICECREAM_BASEDIR="/var/cache/icecream" diff --git a/icecream/patches/icecream-rename-scheduler.patch b/icecream/patches/icecream-rename-scheduler.patch deleted file mode 100644 index 5de7738..0000000 --- a/icecream/patches/icecream-rename-scheduler.patch +++ /dev/null @@ -1,107 +0,0 @@ -Index: icecc-0.9.6/doc/man-scheduler.1.docbook -=================================================================== ---- icecc-0.9.6.orig/doc/man-scheduler.1.docbook -+++ icecc-0.9.6/doc/man-scheduler.1.docbook -@@ -23,13 +23,13 @@ - </refmeta> - - <refnamediv> -- <refname>scheduler</refname> -+ <refname>icecc-scheduler</refname> - <refpurpose>Icecream scheduler</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <cmdsynopsis> --<command>scheduler</command> -+<command>icecc-scheduler</command> - <group> - <arg choice="opt"> - <option>-n</option> -@@ -151,7 +151,7 @@ need to run the scheduler with root righ - - <refsect1> - <title>See Also</title> --<para>icecream, scheduler, iceccd, icemon</para> -+<para>icecream, icecc-scheduler, iceccd, icemon</para> - </refsect1> - - <refsect1> -Index: icecc-0.9.6/services/Makefile.am -=================================================================== ---- icecc-0.9.6.orig/services/Makefile.am -+++ icecc-0.9.6/services/Makefile.am -@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h - noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h - icedir = $(includedir)/icecc - --sbin_PROGRAMS = scheduler --scheduler_SOURCES = scheduler.cpp --scheduler_LDADD = libicecc.la -+sbin_PROGRAMS = icecc-scheduler -+icecc_scheduler_SOURCES = scheduler.cpp -+icecc_scheduler_LDADD = libicecc.la - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = icecc.pc -Index: icecc-0.9.6/services/Makefile.in -=================================================================== ---- icecc-0.9.6.orig/services/Makefile.in -+++ icecc-0.9.6/services/Makefile.in -@@ -37,7 +37,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --sbin_PROGRAMS = scheduler$(EXEEXT) -+sbin_PROGRAMS = icecc-scheduler$(EXEEXT) - subdir = services - DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in -@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - PROGRAMS = $(sbin_PROGRAMS) --am_scheduler_OBJECTS = scheduler.$(OBJEXT) --scheduler_OBJECTS = $(am_scheduler_OBJECTS) --scheduler_DEPENDENCIES = libicecc.la -+am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT) -+icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS) -+icecc_scheduler_DEPENDENCIES = libicecc.la - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -107,8 +107,8 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) --DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) -+SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) -+DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) - DATA = $(pkgconfig_DATA) - HEADERS = $(ice_HEADERS) $(noinst_HEADERS) - ETAGS = etags -@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC - ice_HEADERS = job.h comm.h - noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h - icedir = $(includedir)/icecc --scheduler_SOURCES = scheduler.cpp --scheduler_LDADD = libicecc.la -+icecc_scheduler_SOURCES = scheduler.cpp -+icecc_scheduler_LDADD = libicecc.la - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = icecc.pc - all: all-am -@@ -358,9 +358,9 @@ clean-sbinPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) -- @rm -f scheduler$(EXEEXT) -- $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS) -+icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) -+ @rm -f icecc-scheduler$(EXEEXT) -+ $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 576ea568f5563ff1b56e8b297d1f3cbd3a45c0f4
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 576ea568f5563ff1b56e8b297d1f3cbd3a45c0f4 (commit) via c5ac16e32cb172c38bd24a4b67805c5033b8c10e (commit) from a310d240e25e2bdbef400455ac1a77720f948971 (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 576ea568f5563ff1b56e8b297d1f3cbd3a45c0f4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 8 19:54:40 2013 +0200 gnutls: Fix testsuite. datefudge has been missing to run the testsuite. commit c5ac16e32cb172c38bd24a4b67805c5033b8c10e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Jul 8 19:15:59 2013 +0200 datefudge: New package. ----------------------------------------------------------------------- Summary of changes: datefudge/datefudge.nm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ gnutls/gnutls.nm | 3 ++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 datefudge/datefudge.nm Difference in files: diff --git a/datefudge/datefudge.nm b/datefudge/datefudge.nm new file mode 100644 index 0000000..5efb2f7 --- /dev/null +++ b/datefudge/datefudge.nm @@ -0,0 +1,46 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = datefudge +version = 1.18 +release = 1 + +groups = System/Tools +url = http://anonscm.debian.org/gitweb/?p=users/robert/datefudge.git;a=summary +license = GPLv2 +summary = A tool for faking the system date. + +description + Datefudge fakes the system date so that a program think the wall clock + is different. The faking is not complete; timestamp on files are not + affected in any way. This package is useful if you want to test the date + handling of your programs without changing the system clock. +end + +source_dl = http://ftp.de.debian.org/debian/pool/main/d/%{name}/ +sources = %{name}_%{version}.tar.gz + +build + # Honor our CFLAGS. + make_build_targets += \ + CFLAGS="%{CFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + + test + make test + end + + # Install libs to the correct place. + make_install_targets += \ + libdir=%{libdir}/%{name} +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 70158c7..070a7fc 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -7,7 +7,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.2 ver_min = 1 -release = 1 +release = 1.1 groups = System/Libraries url = http://www.gnu.org/software/gnutls/ @@ -26,6 +26,7 @@ sources = %{thisapp}.tar.xz build requires + datefudge gettext guile-devel libgcrypt-devel hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa (commit) via fcfd54ba9b883d0776f320e93ef422a5b2c3c73d (commit) via 204cab0218cfbc1abbbdba2ac60f862ae6bca42b (commit) from 3033567376ee335545ac2b177c826ca2f287b446 (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 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 8 19:58:11 2013 +0200 functions.network: fix cursor position at status write. commit fcfd54ba9b883d0776f320e93ef422a5b2c3c73d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 7 00:09:06 2013 +0200 dnsmasq: kill already old instances before start. commit 204cab0218cfbc1abbbdba2ac60f862ae6bca42b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 22:26:08 2013 +0200 wireless-client: add cgi to iso. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 1 + config/rootfiles/core/71/filelists/files | 1 + src/initscripts/init.d/dnsmasq | 3 +++ src/initscripts/init.d/networking/functions.network | 2 ++ 4 files changed, 7 insertions(+) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 802ddcb..9be3581 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1431,6 +1431,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/webaccess.cgi srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/xtaccess.cgi srv/web/ipfire/html var/updatecache diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files index b15981f..fe6b73d 100644 --- a/config/rootfiles/core/71/filelists/files +++ b/config/rootfiles/core/71/filelists/files @@ -3,6 +3,7 @@ etc/issue var/ipfire/general-functions.pl var/ipfire/header.pl var/ipfire/menu.d/10-system.menu +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/wlanclient etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/wpa_supplicant.exe diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 1185921..1b2c0c2 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -24,6 +24,9 @@ SHOW_SRV=1 case "${1}" in start) + # kill already running copy of dnsmasq... + killproc /usr/sbin/dnsmasq 2>&1 > /dev/null + boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network index 26cc65c..b1ce220 100755 --- a/src/initscripts/init.d/networking/functions.network +++ b/src/initscripts/init.d/networking/functions.network @@ -142,11 +142,13 @@ dhcpcd_stop() { # Display console message, depended on the exit code # of the stopped dhcpcd. if [ "${ret}" -eq 0 ]; then + boot_mesg echo_ok elif [ "${ret}" -eq 1 ]; then boot_mesg "failed to stop dhcpcd!" ${WARNING} echo_warning else + boot_mesg echo_failure fi fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a310d240e25e2bdbef400455ac1a77720f948971
by git＠ipfire.org 08 Jul '13

08 Jul '13

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 a310d240e25e2bdbef400455ac1a77720f948971 (commit) from c412246c65ee7679a7139125cd5da59e615b36a4 (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 a310d240e25e2bdbef400455ac1a77720f948971 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jul 8 15:06:49 2013 +0200 dosfstools: Update to 3.0.20. ----------------------------------------------------------------------- Summary of changes: dosfstools/dosfstools.nm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Difference in files: diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm index 69d28ae..c99a203 100644 --- a/dosfstools/dosfstools.nm +++ b/dosfstools/dosfstools.nm @@ -4,7 +4,7 @@ ############################################################################### name = dosfstools -version = 3.0.16 +version = 3.0.20 release = 1 groups = System/Filesystems @@ -13,13 +13,12 @@ license = GPLv3+ summary = Utilities for making and checking MS-DOS FAT filesystems on Linux. description - The dosfstools package includes the mkdosfs and dosfsck utilities, \ - which respectively make and check MS-DOS FAT filesystems on hard \ + The dosfstools package includes the mkdosfs and dosfsck utilities, + which respectively make and check MS-DOS FAT filesystems on hard drives or on floppies. end source_dl = http://www.daniel-baumann.ch/files/software/dosfstools/ -sources = %{thisapp}.tar.gz build install @@ -30,7 +29,6 @@ end packages package %{name} - end package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c412246c65ee7679a7139125cd5da59e615b36a4
by git＠ipfire.org 07 Jul '13

07 Jul '13

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 c412246c65ee7679a7139125cd5da59e615b36a4 (commit) via fb24f57072349eee8bae203d4d5990ede7dbb4ea (commit) via 3bb0cf724e1aac823f9c1fb752b2f5699fb8ea6b (commit) via 67c2f9862ffe8bd86e596fa69b1469ba6e64ba1d (commit) from eb0a79e888bfd7abb91e14e5c901642630e35ff3 (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 c412246c65ee7679a7139125cd5da59e615b36a4 Merge: 3bb0cf7 fb24f57 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 22:15:52 2013 +0200 Merge remote-tracking branch 'stevee/doxygen' commit fb24f57072349eee8bae203d4d5990ede7dbb4ea Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jul 3 21:09:57 2013 +0200 doxygen: New package. commit 3bb0cf724e1aac823f9c1fb752b2f5699fb8ea6b Merge: eb0a79e 67c2f98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 22:14:27 2013 +0200 Merge remote-tracking branch 'stevee/libjpeg-fix' commit 67c2f9862ffe8bd86e596fa69b1469ba6e64ba1d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 7 16:41:32 2013 +0200 libjpeg: Fix hardcoded path. There was a hardcoded path on the packages section, which leads to a wrong dependency of the main to the devel package for x86_64 systems. ----------------------------------------------------------------------- Summary of changes: doxygen/doxygen.nm | 47 +++++++++++ doxygen/patches/doxygen-1.4.8-endless-loop.patch | 27 ++++++ ...ygen-1.8.1.1-html_timestamp_default_false.patch | 12 +++ doxygen/patches/doxygen-1.8.3-multilib.patch | 43 ++++++++++ doxygen/patches/doxygen-1.8.4-config.patch | 95 ++++++++++++++++++++++ libjpeg/libjpeg.nm | 4 +- 6 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 doxygen/doxygen.nm create mode 100644 doxygen/patches/doxygen-1.4.8-endless-loop.patch create mode 100644 doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch create mode 100644 doxygen/patches/doxygen-1.8.3-multilib.patch create mode 100644 doxygen/patches/doxygen-1.8.4-config.patch Difference in files: diff --git a/doxygen/doxygen.nm b/doxygen/doxygen.nm new file mode 100644 index 0000000..a8a4660 --- /dev/null +++ b/doxygen/doxygen.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = doxygen +version = 1.8.4 +release = 1 + +groups = Development/Tools +url = http://www.stack.nl/~dimitri/doxygen/index.html +license = GPL+ +summary = A documentation system for C/C++. + +description + Doxygen can generate an online class browser (in HTML) and/or a + reference manual (in LaTeX) from a set of documented source files. +end + +source_dl = ftp://ftp.stack.nl/pub/users/dimitri/ +sources = %{name}-%{version}.src.tar.gz + +build + requires + /usr/bin/perl + bison + flex + end + + # Not autoconf-based, so we cannot use our default configure macro. + configure_options = \ + --prefix %{prefix} \ + --shared \ + --release + + # Use or CFLAGS. + make_build_targets += \ + CFLAGS="%{CFLAGS}" +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/doxygen/patches/doxygen-1.4.8-endless-loop.patch b/doxygen/patches/doxygen-1.4.8-endless-loop.patch new file mode 100644 index 0000000..a62428b --- /dev/null +++ b/doxygen/patches/doxygen-1.4.8-endless-loop.patch @@ -0,0 +1,27 @@ +commit 5e056236c9ef3b3675d014cab43480700027d60b +Author: Dimitri van Heesch <dimitri(a)stack.nl> +Date: Thu May 30 20:01:15 2013 +0200 + + Bug 701295 - Doxygen 1.8.4 goes into an endless loop + +diff --git a/src/util.cpp b/src/util.cpp +index 0d70d43..0c36fc0 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) + ++templateDepth; + pos=nextOpenPos-1; + } +- else ++ else if (nextClosePos!=-1) + { + --templateDepth; + pos=nextClosePos-1; + } ++ else // more >'s than <'s, see bug701295 ++ { ++ return -1; ++ } + } + else + { diff --git a/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch b/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch new file mode 100644 index 0000000..9c01fec --- /dev/null +++ b/doxygen/patches/doxygen-1.8.1.1-html_timestamp_default_false.patch @@ -0,0 +1,12 @@ +diff -up doxygen-1.8.1.1/src/configoptions.cpp.html_timestamp_off.patch doxygen-1.8.1.1/src/configoptions.cpp +--- doxygen-1.8.1.1/src/configoptions.cpp.html_timestamp_off.patch 2012-06-09 06:41:04.000000000 -0500 ++++ doxygen-1.8.1.1/src/configoptions.cpp 2012-06-13 13:31:15.291500215 -0500 +@@ -1270,7 +1270,7 @@ void addConfigOptions(Config *cfg) + "If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML\n" + "page will contain the date and time when the page was generated. Setting\n" + "this to NO can help when comparing the output of multiple runs.", +- TRUE ++ FALSE + ); + cb->addDependency("GENERATE_HTML"); + //---- diff --git a/doxygen/patches/doxygen-1.8.3-multilib.patch b/doxygen/patches/doxygen-1.8.3-multilib.patch new file mode 100644 index 0000000..7cb1c92 --- /dev/null +++ b/doxygen/patches/doxygen-1.8.3-multilib.patch @@ -0,0 +1,43 @@ +diff -up doxygen-1.8.3/src/htmlgen.cpp.multilib doxygen-1.8.3/src/htmlgen.cpp +--- doxygen-1.8.3/src/htmlgen.cpp.multilib 2012-12-25 11:27:52.000000000 +0100 ++++ doxygen-1.8.3/src/htmlgen.cpp 2013-01-02 17:08:57.559028518 +0100 +@@ -125,6 +125,17 @@ static unsigned char tab_b_png[36] = + 205, 207, 209, 211, 213, 217, 219, 206, 188 + }; + ++static unsigned char nav_g_png[95] = { ++0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, ++0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, ++0x08, 0x06, 0x00, 0x00, 0x00, 0x02, 0x10, 0xf4, 0x31, 0x00, 0x00, 0x00, ++0x26, 0x49, 0x44, 0x41, 0x54, 0x78, 0x01, 0xed, 0xdd, 0x31, 0x0d, 0x00, ++0x00, 0x08, 0x03, 0xc1, 0x4f, 0x48, 0x17, 0x66, 0x84, 0xe1, 0x5f, 0x0d, ++0x2d, 0x3e, 0x7e, 0xb8, 0xe5, 0x4d, 0x20, 0x69, 0xcb, 0x4d, 0xe8, 0xc0, ++0x83, 0x07, 0x07, 0x0f, 0x53, 0x00, 0xbd, 0xfc, 0x82, 0x3c, 0x05, 0x00, ++0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, ++}; ++ + // hovering tab background luma + static unsigned char tab_h_png[36] = + { +@@ -824,6 +835,7 @@ static ColoredImgDataItem colored_tab_da + { "tab_s.png", 1, 36, tab_s_png, 0 }, + { "nav_h.png", 1, 12, header_png, 0 }, + { "nav_f.png", 1, 56, func_header_png, 0 }, ++ { "nav_g.png", 1, 6, nav_g_png, 0 }, + { "bc_s.png", 8, 30, bc_s_png, bc_s_a_png }, + { "doxygen.png", 104,31, doxygen_png, doxygen_a_png }, + { "closed.png", 9, 9, closed_png, closed_a_png }, +@@ -1502,13 +1514,6 @@ void HtmlGenerator::writeTabData() + Doxygen::indexList->addStyleSheetFile("tabs.css"); + QCString dname=Config_getString("HTML_OUTPUT"); + writeColoredImgData(dname,colored_tab_data); +- +- { +- unsigned char shadow[6] = { 5, 5, 5, 5, 5, 5 }; +- unsigned char shadow_alpha[6] = { 80, 60, 40, 20, 10, 0 }; +- ColoredImage img(1,6,shadow,shadow_alpha,0,0,100); +- img.save(dname+"/nav_g.png"); +- } + } + + void HtmlGenerator::writeSearchData(const char *dir) diff --git a/doxygen/patches/doxygen-1.8.4-config.patch b/doxygen/patches/doxygen-1.8.4-config.patch new file mode 100644 index 0000000..5c789be --- /dev/null +++ b/doxygen/patches/doxygen-1.8.4-config.patch @@ -0,0 +1,95 @@ +diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in +--- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100 ++++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200 +@@ -10,8 +10,6 @@ + # See the GNU General Public License for more details. + # + +-QMAKE=qmake $(MKSPECS) +- + all: Makefile.doxywizard + $(MAKE) -f Makefile.doxywizard + +@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard + $(RM) Makefile.doxywizard + + install: +- $(INSTTOOL) -d $(INSTALL)/bin +- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin +- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) + cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 +- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 ++ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1 + rm doxywizard.1 + + FORCE: +diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure +--- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200 ++++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200 +@@ -296,9 +296,10 @@ if test "$f_wizard" = YES; then + if test -z "$QTDIR"; then + echo " QTDIR environment variable not set!" + printf " Checking for Qt..." +- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do ++ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do + if test -x "$d/bin/qmake"; then + QTDIR=$d ++ QMAKE=$d/bin/qmake + fi + done + else +@@ -606,6 +607,8 @@ INSTTOOL = $f_insttool + DOXYDOCS = .. + DOCDIR = $f_docdir + QTDIR = $QTDIR ++QMAKE = $QMAKE ++MAN1DIR = share/man/man1 + EOF + + if test "$f_dot" != NO; then +diff -up doxygen-1.8.4/Makefile.in.config doxygen-1.8.4/Makefile.in +--- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200 ++++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200 +@@ -53,8 +53,6 @@ distclean: clean + + DATE=$(shell date "+%B %Y") + +-MAN1DIR = man/man1 +- + install: doxywizard_install doxysearch_install + $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin + $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin +diff -up doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf +--- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100 ++++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200 +@@ -11,7 +11,7 @@ TMAKE_CC = gcc + TMAKE_CFLAGS = -pipe + TMAKE_CFLAGS_WARN_ON = -Wall -W + TMAKE_CFLAGS_WARN_OFF = +-TMAKE_CFLAGS_RELEASE = -O2 ++TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) + TMAKE_CFLAGS_DEBUG = -g + TMAKE_CFLAGS_SHLIB = -fPIC + TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC + + TMAKE_INCDIR = + TMAKE_LIBDIR = +-TMAKE_INCDIR_X11 = /usr/X11R6/include +-TMAKE_LIBDIR_X11 = /usr/X11R6/lib +-TMAKE_INCDIR_QT = $(QTDIR)/include +-TMAKE_LIBDIR_QT = $(QTDIR)/lib +-TMAKE_INCDIR_OPENGL = /usr/X11R6/include +-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++TMAKE_INCDIR_X11 = ++TMAKE_LIBDIR_X11 = ++TMAKE_INCDIR_QT = ++TMAKE_LIBDIR_QT = ++TMAKE_INCDIR_OPENGL = ++TMAKE_LIBDIR_OPENGL = + + TMAKE_LINK = g++ + TMAKE_LINK_SHLIB = g++ diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm index e592118..50c8b35 100644 --- a/libjpeg/libjpeg.nm +++ b/libjpeg/libjpeg.nm @@ -5,7 +5,7 @@ name = libjpeg version = 1.2.0 -release = 1 +release = 2 thisapp = libjpeg-turbo-%{version} groups = System/Libraries @@ -48,7 +48,7 @@ packages package %{name}-devel template DEVEL - files += !/usr/lib/libturbojpeg.so + files += !%{libdir}/libturbojpeg.so end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. eb0a79e888bfd7abb91e14e5c901642630e35ff3
by git＠ipfire.org 07 Jul '13

07 Jul '13

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 eb0a79e888bfd7abb91e14e5c901642630e35ff3 (commit) via 5cf285fa87a5050e415bc4e47fc32ef5f3e35f1e (commit) via 8eb73ff1680d75d048cd40031384a31aea694b67 (commit) via f7dd43350987c29687784636133715aa26d93298 (commit) via b99f56d75409aed3e58f285c765d4715ac961ced (commit) via abd5008105115eabbf4a8f5890a1bcf1df812ef0 (commit) from c84b55f63498f6676c5da561beda9340f656d3dc (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 eb0a79e888bfd7abb91e14e5c901642630e35ff3 Merge: c84b55f 5cf285f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 11:24:03 2013 +0200 Merge branch 'gcc-4.8' commit 5cf285fa87a5050e415bc4e47fc32ef5f3e35f1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 11:23:17 2013 +0200 gnutls: Update to 3.2.1. commit 8eb73ff1680d75d048cd40031384a31aea694b67 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 11:14:37 2013 +0200 nettle: Update to 2.7.1. commit f7dd43350987c29687784636133715aa26d93298 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 11:14:17 2013 +0200 samba: Update to 3.6.16. commit b99f56d75409aed3e58f285c765d4715ac961ced Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 10:51:11 2013 +0200 pcre: Update to 8.33. commit abd5008105115eabbf4a8f5890a1bcf1df812ef0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 7 10:43:03 2013 +0200 gzip: Update to 1.6. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 17 ++++++++--------- gzip/gzip.nm | 5 ++++- gzip/patches/gzip-1.3.5-zforce.patch | 2 +- gzip/patches/gzip-1.3.9-addsuffix.patch | 19 ------------------- nettle/nettle.nm | 3 +-- pcre/pcre.nm | 9 ++++++++- samba/samba.nm | 5 ++--- 7 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 gzip/patches/gzip-1.3.9-addsuffix.patch Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index f4c2b69..70158c7 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -5,8 +5,8 @@ name = gnutls version = %{ver_maj}.%{ver_min} -ver_maj = 3.1 -ver_min = 9 +ver_maj = 3.2 +ver_min = 1 release = 1 groups = System/Libraries @@ -32,7 +32,7 @@ build libidn-devel libtasn1-devel >= 3.2 lzo-devel - nettle-devel >= 2.5 + nettle-devel >= 2.7 perl p11-kit-devel >= 0.14 readline-devel @@ -44,21 +44,20 @@ build configure_options += \ --with-included-libcfg \ - --disable-srp-authentication \ --disable-openssl-compatibility \ --with-libgcrypt # Test suite does not work when srp is disabled. - #test - # export LD_LIBRARY_PATH=$(pwd)/lib/.libs - # make check - #end + test + export LD_LIBRARY_PATH=$(pwd)/lib/.libs + make check + end end packages package %{name} requires - nettle >= 2.5 + nettle >= 2.7 p11-kit >= 0.14 end end diff --git a/gzip/gzip.nm b/gzip/gzip.nm index 020e9d7..20c389b 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -4,7 +4,7 @@ ############################################################################### name = gzip -version = 1.5 +version = 1.6 release = 1 groups = Applications/Compression @@ -23,6 +23,9 @@ build requires coreutils less + texinfo + + /usr/bin/more end # NO_ASM is for textrels. diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch index 5a9beca..b13c766 100644 --- a/gzip/patches/gzip-1.3.5-zforce.patch +++ b/gzip/patches/gzip-1.3.5-zforce.patch @@ -6,7 +6,7 @@ diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in fi - if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then -+ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then ++ if gzip -l < "$i" 2>/dev/null | grep 'compressed' > /dev/null; then new="$i.gz" if mv "$i" "$new"; then diff --git a/gzip/patches/gzip-1.3.9-addsuffix.patch b/gzip/patches/gzip-1.3.9-addsuffix.patch deleted file mode 100644 index 80a823d..0000000 --- a/gzip/patches/gzip-1.3.9-addsuffix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gzip-1.3.9/zmore.in.pom 2007-01-15 15:31:26.000000000 +0100 -+++ gzip-1.3.9/zmore.in 2007-01-15 15:34:06.000000000 +0100 -@@ -70,7 +70,7 @@ - --v*) exec echo "$version";; - esac - -- < "$FILE" || continue -+ if test -e $FILE || test -e $FILE.gz; then - if test $FIRST -eq 0; then - echo $n1 "--More--(Next file: $FILE)$n2" - stty $cb -echo 2>/dev/null -@@ -88,5 +88,7 @@ - if test -t 1; then - FIRST=0 - fi -+ else < $FILE -+ fi - done - fi diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 83d4acb..75becbe 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,7 +4,7 @@ ############################################################################### name = nettle -version = 2.5 +version = 2.7.1 release = 1 groups = System/Libraries @@ -25,7 +25,6 @@ build requires gmp-devel m4 - openssl-devel end configure_options += \ diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 8e1797b..53e27eb 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,7 +4,7 @@ ############################################################################### name = pcre -version = 8.32 +version = 8.33 release = 1 compat_version = 8.21 @@ -48,6 +48,13 @@ build make %{PARALLELISMFLAGS} end + test + make check + + cd %{DIR_SRC}/%{name}-%{compat_version} + make check + end + install_cmds cd %{DIR_SRC}/%{name}-%{compat_version} install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} diff --git a/samba/samba.nm b/samba/samba.nm index 75274f2..39f4c84 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -4,10 +4,9 @@ ############################################################################### name = samba -version = 3.6.5 -release = 2 +version = 3.6.16 +release = 1 -maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons url = http://www.samba.org/ license = GPLv3+ and LGPLv3+ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3033567376ee335545ac2b177c826ca2f287b446
by git＠ipfire.org 06 Jul '13

06 Jul '13

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 3033567376ee335545ac2b177c826ca2f287b446 (commit) from a1b4e3c22de4806bd30c485c4628db307fac21e5 (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 3033567376ee335545ac2b177c826ca2f287b446 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 6 19:49:59 2013 +0200 wireless-client: add wireless cfg to iso, backup and core71. ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/common/configroot | 1 + config/rootfiles/core/71/filelists/files | 1 + config/rootfiles/core/71/update.sh | 5 +++++ lfs/configroot | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index 9b08683..8463a89 100644 --- a/config/backup/include +++ b/config/backup/include @@ -39,3 +39,4 @@ /root/.gitconfig /root/.bash_history /var/ipfire/ethernet/aliases +/var/ipfire/ethernet/wireless diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e97134f..3910b36 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -36,6 +36,7 @@ var/ipfire/ethernet #var/ipfire/ethernet/scanned_nics #var/ipfire/ethernet/settings #var/ipfire/ethernet/vlans +#var/ipfire/ethernet/wireless #var/ipfire/extrahd #var/ipfire/extrahd/bin var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files index 51d4ff4..b15981f 100644 --- a/config/rootfiles/core/71/filelists/files +++ b/config/rootfiles/core/71/filelists/files @@ -13,3 +13,4 @@ etc/rc.d/rc6.d/K82wlanclient usr/local/bin/wirelessclient srv/web/ipfire/cgi-bin/wirelessclient.cgi var/ipfire/langs +var/ipfire/backup/include diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh index c83ffef..5a5e1b1 100644 --- a/config/rootfiles/core/71/update.sh +++ b/config/rootfiles/core/71/update.sh @@ -40,6 +40,11 @@ done extract_files # +#Create wireless config file... +touch /var/ipfire/ethernet/wireless +chown nobody:nobody /var/ipfire/ethernet/wireless + +# #Start services # diff --git a/lfs/configroot b/lfs/configroot index f8fe426..1f84a16 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 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 # @@ -64,7 +64,7 @@ $(TARGET) : for i in auth/users backup/include.user backup/exclude.user \ certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ - extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ + ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a1b4e3c22de4806bd30c485c4628db307fac21e5
by git＠ipfire.org 06 Jul '13

06 Jul '13

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2013