IPFire-SCM June 2012

ipfire-scm@lists.ipfire.org

1 participants
48 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4e8b2c0697da6c0a96e7d4559a97315883f6c516
by git＠ipfire.org 24 Jun '12

24 Jun '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 4e8b2c0697da6c0a96e7d4559a97315883f6c516 (commit) via b0fdf1902418360a57acb8cfd12da6aeb9c430fd (commit) via 62f274aaed5396e5e740fcf5d3ce34f79f032856 (commit) via 4b31eaddadd313c047b87ddd8a26c7e2ed60319a (commit) via 5924dccf0489ab924b3065ee11010e29b56fb04f (commit) via 17fdd6ece7a8c97914a2511ae2ac3929170addce (commit) via db4581cb4088b69f44ba2fb7d1c87fc77c8e684f (commit) via 3650d2d589cad1a29bc45d90b616e252099349be (commit) from e8addcea91d9029d4c05de29188d30b3fbba4ece (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 4e8b2c0697da6c0a96e7d4559a97315883f6c516 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 15:14:37 2012 +0200 tcl: Fix library permissions. commit b0fdf1902418360a57acb8cfd12da6aeb9c430fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 15:11:07 2012 +0200 gettext: Fix library permissions. commit 62f274aaed5396e5e740fcf5d3ce34f79f032856 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 15:08:44 2012 +0200 gcc: Fix library permissions. commit 4b31eaddadd313c047b87ddd8a26c7e2ed60319a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 14:14:33 2012 +0200 glibc: Fix library permissions. commit 5924dccf0489ab924b3065ee11010e29b56fb04f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 13:52:12 2012 +0200 nettle: Fix library permissions. commit 17fdd6ece7a8c97914a2511ae2ac3929170addce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 13:48:39 2012 +0200 pcre: Fix library permissions. commit db4581cb4088b69f44ba2fb7d1c87fc77c8e684f Merge: 3650d2d e8addce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 13:44:46 2012 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 3650d2d589cad1a29bc45d90b616e252099349be Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 23 23:19:03 2012 +0200 kmod: Update to 9. ----------------------------------------------------------------------- Summary of changes: gcc/gcc.nm | 6 ++++-- gettext/gettext.nm | 5 ++++- glibc/glibc.nm | 5 ++++- kmod/kmod.nm | 8 +++++--- nettle/nettle.nm | 8 +++++++- pcre/pcre.nm | 4 ++-- tcl/tcl.nm | 5 ++++- 7 files changed, 30 insertions(+), 11 deletions(-) Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index c2a04c3..dbd1fcb 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1 name = gcc version = 4.7.1 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -243,9 +243,10 @@ build EOF ;; *) - ln -svf ../../../../../%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so + ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so ;; esac + chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1 # Remove some GNU debugger stuff. rm -vf %{BUILDROOT}%{libdir}/lib*.py @@ -369,6 +370,7 @@ packages end provides = /lib/cpp + requires = gcc-c++ = %{thisver} end package libgcc diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 3416a0a..5a9f367 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@ name = gettext version = 0.18.1.1 -release = 7 +release = 8 groups = System/Base url = http://www.gnu.org/software/gettext/ @@ -51,6 +51,9 @@ build chrpath -l ${i} && chrpath --delete ${i} fi done + + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/preloadable_libintl.so end end diff --git a/glibc/glibc.nm b/glibc/glibc.nm index e5a6aa0..c9264c5 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.15 -release = 3 +release = 4 thisapp = %{name}-2.15-a316c1f maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -233,6 +233,9 @@ build # Move some libs to correct place mv -v %{BUILDROOT}/%{lib}/lib{memusage,pcprofile}.so %{BUILDROOT}%{libdir} + + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/lib*.so* end keep_libraries diff --git a/kmod/kmod.nm b/kmod/kmod.nm index 4996d40..de953e9 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,8 +4,8 @@ ############################################################################### name = kmod -version = 7 -release = 3 +version = 9 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Kernel @@ -33,7 +33,9 @@ build --with-xz \ --with-zlib - # The testsuite does generate lots of errors. + test + make check + end install_cmds mkdir -pv %{BUILDROOT}%{prefix}/lib/modprobe.d diff --git a/nettle/nettle.nm b/nettle/nettle.nm index af0a929..df0e73a 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -5,7 +5,7 @@ name = nettle version = 2.4 -release = 1 +release = 2 groups = System/Libraries url = http://www.lysator.liu.se/~nisse/nettle/ @@ -34,6 +34,12 @@ build test make check end + + install_cmds + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/libhogweed.so.* + chmod 755 %{BUILDROOT}%{libdir}/libnettle.so.* + end end packages diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 9615bb3..3493b61 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -5,7 +5,7 @@ name = pcre version = 8.30 -release = 1 +release = 2 compat_version = 8.21 @@ -50,7 +50,7 @@ build install_cmds cd %{DIR_SRC}/%{name}-%{compat_version} - install -m 644 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} + install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libprce.so.0 end end diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 11a9287..86eda72 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -6,7 +6,7 @@ name = tcl major_ver = 8.5 version = %{major_ver}.11 -release = 1 +release = 2 thisapp = tcl%{version} groups = Development/Languages @@ -77,6 +77,9 @@ build # remove buildroot traces sed -i -e "s|$PWD/unix|%{libdir}|; s|$PWD|%{includedir}/%{name}-private|" %{BUILDROOT}%{libdir}/%{name}Config.sh rm -rf %{BUILDROOT}%{datadir}/%{name}%{major_ver}/ldAix + + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/libtcl*.so* end # Keep libtclstub*.a. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e8addcea91d9029d4c05de29188d30b3fbba4ece
by git＠ipfire.org 24 Jun '12

24 Jun '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 e8addcea91d9029d4c05de29188d30b3fbba4ece (commit) via 410a6818d006bce9a4e777d2357dddfac8d1bb47 (commit) from cd069e941a85c345635ee58d14c6d2b7adc6e532 (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 e8addcea91d9029d4c05de29188d30b3fbba4ece Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 13:16:09 2012 +0200 attr: Fix library permissions. commit 410a6818d006bce9a4e777d2357dddfac8d1bb47 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 24 02:35:31 2012 +0200 acl: Fix library permissions. ----------------------------------------------------------------------- Summary of changes: acl/acl.nm | 7 ++++++- attr/attr.nm | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) Difference in files: diff --git a/acl/acl.nm b/acl/acl.nm index adf7075..d75eded 100644 --- a/acl/acl.nm +++ b/acl/acl.nm @@ -5,7 +5,7 @@ name = acl version = 2.2.51 -release = 2 +release = 3 groups = System/Filesystems url = http://oss.sgi.com/projects/xfs/ @@ -39,6 +39,11 @@ build end make_install_targets += install-dev install-lib + + install_cmds + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/libacl.so.* + end end packages diff --git a/attr/attr.nm b/attr/attr.nm index 2a9b2f0..31144ec 100644 --- a/attr/attr.nm +++ b/attr/attr.nm @@ -5,7 +5,7 @@ name = attr version = 2.4.43 -release = 6 +release = 7 groups = System/Filesystems url = http://oss.sgi.com/projects/xfs/ @@ -36,6 +36,9 @@ build # Fix absolute symlink. rm -rvf %{BUILDROOT}%{libdir}/libattr.so ln -svf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so + + # Fix library permissions. + chmod 755 %{BUILDROOT}%{libdir}/libattr.so.* 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. cd069e941a85c345635ee58d14c6d2b7adc6e532
by git＠ipfire.org 23 Jun '12

23 Jun '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. ef7344ff5166b9cfaf509c80522150fb4e562681
by git＠ipfire.org 23 Jun '12

23 Jun '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 ef7344ff5166b9cfaf509c80522150fb4e562681 (commit) from 397eafa577ddeab9511ffc23fcf1271527a0de47 (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 ef7344ff5166b9cfaf509c80522150fb4e562681 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 23 22:40:29 2012 +0200 rp-pppoe: New package. Comes with a devlopment pppoe-server, a pppoe-relay and a sniffer. ----------------------------------------------------------------------- Summary of changes: rp-pppoe/rp-pppoe.nm | 75 ++++++++++++++++++++++++++++++++ rp-pppoe/systemd/pppoe-server@.service | 11 +++++ 2 files changed, 86 insertions(+), 0 deletions(-) create mode 100644 rp-pppoe/rp-pppoe.nm create mode 100644 rp-pppoe/systemd/pppoe-server@.service Difference in files: diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm new file mode 100644 index 0000000..0751f43 --- /dev/null +++ b/rp-pppoe/rp-pppoe.nm @@ -0,0 +1,75 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = rp-pppoe +version = 3.10 +release = 1 + +groups = Networking/Dialin +url = http://www.roaringpenguin.com/pppoe/ +license = GPLv2+ +summary = Administration tools for PPPoE connections. + +description + PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by + many ADSL Internet Service Providers. + This package contains a set of tools to build your own PPPoE server. +end + +source_dl = http://www.roaringpenguin.com/files/download/ + +build + requires + autoconf + automake + iproute2 + libtool + ppp-devel + end + + DIR_APP := %{DIR_APP}/src + CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing + + prepare_cmds + # PLUGIN_DIR defaults to /etc/ppp/plugins, which is not what we want. + sed -i Makefile.in \ + -e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/$(pppd --version | awk '{ print $NF }')@" + + # Always enable kernel mode PPPoE for the server, because we + # don't ship the userspace component. + sed -i pppoe-server.c \ + -e "s/UseLinuxKernelModePPPoE = 0/UseLinuxKernelModePPPoE = 1/" + + autoconf + end + + # Force support for kernel-mode PPPoE. + #configure_options += \ + # ac_cv_header_linux_if_pppox_h=yes + + install_cmds + # Remove all the client components because we only support the + # rp-pppoe plugin that comes with pppd. + rm -rvf %{BUILDROOT}%{sysconfdir} + rm -vf %{BUILDROOT}%{sbindir}/pppoe + rm -vf %{BUILDROOT}%{sbindir}/pppoe-{connect,start,stop,status,setup} + rm -vf %{BUILDROOT}%{mandir}/man*/pppoe-{connect,start,stop,status,setup}* + rm -vf %{BUILDROOT}%{mandir}/man*/pppoe.{,conf}* + rm -rvf ${BUILDROOT}%{libdir} + end +end + +packages + package %{name} + requires + iproute2 + ppp + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/rp-pppoe/systemd/pppoe-server@.service b/rp-pppoe/systemd/pppoe-server@.service new file mode 100644 index 0000000..141bc8a --- /dev/null +++ b/rp-pppoe/systemd/pppoe-server@.service @@ -0,0 +1,11 @@ +[Unit] +Description=PPPoE server daemon on %I +BindTo=dev-%I.device +After=dev-%I.device + +[Service] +ExecStart=/usr/lib/network/pppoe-server %I +ExecStopPost=/usr/lib/network/pppoe-server %I cleanup +Restart=failure +UtmpIdentifier=%I +KillMode=process hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 397eafa577ddeab9511ffc23fcf1271527a0de47
by git＠ipfire.org 23 Jun '12

23 Jun '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 397eafa577ddeab9511ffc23fcf1271527a0de47 (commit) from b2a949143087fb84a6161283ad16e905bf91d55d (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 397eafa577ddeab9511ffc23fcf1271527a0de47 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 23 18:25:40 2012 +0200 ldapvi: Fix installation of files. ----------------------------------------------------------------------- Summary of changes: ldapvi/ldapvi.nm | 6 +----- ldapvi/patches/GNUmakefile.in.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 ldapvi/patches/GNUmakefile.in.patch Difference in files: diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm index 63c5d9e..fb0ff9c 100644 --- a/ldapvi/ldapvi.nm +++ b/ldapvi/ldapvi.nm @@ -5,7 +5,7 @@ name = ldapvi version = 1.7 -release = 1 +release = 2 groups = Applications/Editors url = http://www.lichteblau.com/ldapvi/ @@ -36,10 +36,6 @@ build sed -e "s/getline/_&/g" -i $i done end - - install - make install prefix=%{BUILDROOT}/usr - end end packages diff --git a/ldapvi/patches/GNUmakefile.in.patch b/ldapvi/patches/GNUmakefile.in.patch new file mode 100644 index 0000000..11afafe --- /dev/null +++ b/ldapvi/patches/GNUmakefile.in.patch @@ -0,0 +1,24 @@ +--- ldapvi-1.7/GNUmakefile.in 2007-05-05 11:17:26.000000000 +0100 ++++ GNUmakefile.in 2007-07-05 13:34:33.000000000 +0100 +@@ -4,6 +4,7 @@ + INSTALL:=@INSTALL@ + prefix:=@prefix@ + exec_prefix:=@exec_prefix@ ++datarootdir:=@datarootdir@ + + all: ldapvi + +@@ -25,10 +26,9 @@ + + .PHONY: install + install: ldapvi +- mkdir -p @bindir@ @mandir@/man1/ @prefix@/share/doc/ldapvi +- @INSTALL_PROGRAM@ ldapvi @bindir@ +- @INSTALL_PROGRAM@ -m 644 ldapvi.1 @mandir@/man1/ +- @INSTALL_PROGRAM@ -m 644 manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl @prefix@/share/doc/ldapvi ++ mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@prefix@/share/doc/ldapvi ++ @INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@ ++ @INSTALL_PROGRAM@ -m 644 ldapvi.1 $(DESTDIR)@mandir@/man1/ + + distclean: + rm -rf configure GNUmakefile config.h config.log autom4te.cache config.status hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b2a949143087fb84a6161283ad16e905bf91d55d
by git＠ipfire.org 23 Jun '12

23 Jun '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 b2a949143087fb84a6161283ad16e905bf91d55d (commit) via 9beff42290748d4666c6427d9422aa9ccfcb1483 (commit) from cd3ed4fd8d3529277cc27369a1633579fbb6d51a (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 b2a949143087fb84a6161283ad16e905bf91d55d Merge: 9beff42 cd3ed4f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 23 12:22:28 2012 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 9beff42290748d4666c6427d9422aa9ccfcb1483 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 23 12:22:03 2012 +0200 xz: Update to 5.0.4. Minor bugfix release. ----------------------------------------------------------------------- Summary of changes: xz/xz.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/xz/xz.nm b/xz/xz.nm index 16ed2cd..800b87a 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,8 +4,8 @@ ############################################################################### name = xz -version = 5.0.3 -release = 7 +version = 5.0.4 +release = 1 compat_version = 4.999.9beta hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cd3ed4fd8d3529277cc27369a1633579fbb6d51a
by git＠ipfire.org 22 Jun '12

22 Jun '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 cd3ed4fd8d3529277cc27369a1633579fbb6d51a (commit) via e35ee5f672dcb1c1ec76d3b935d7c233c0e8e30a (commit) via c7edeb0f4d221247569bbc64b855925525463a86 (commit) via 6717aa4bb11969de8759b7ade6087f56b2f4580f (commit) via da8841980ad55cdb6b7918a28164d01f99a9e739 (commit) via 93959bfe3ef46fed5da1861a14a532691bcc3e52 (commit) via 5cc0c01311ef0f893f8b541c762e5541b538a956 (commit) from 9901f43c0befba1a781b844760a68b4f4fd74cf6 (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 cd3ed4fd8d3529277cc27369a1633579fbb6d51a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 22 11:26:42 2012 +0000 ppp: Add systemd unit files. commit e35ee5f672dcb1c1ec76d3b935d7c233c0e8e30a Merge: c7edeb0 9901f43 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 22 11:26:26 2012 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit c7edeb0f4d221247569bbc64b855925525463a86 Merge: 6717aa4 a965b2d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 20 22:55:06 2012 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 6717aa4bb11969de8759b7ade6087f56b2f4580f Merge: da88419 9d35ee5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 5 21:04:51 2012 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit da8841980ad55cdb6b7918a28164d01f99a9e739 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 27 12:18:22 2012 +0000 dhcp: Update the systemd unit file for dhclient. This update enables dhclient to be properly used with the current networking code. commit 93959bfe3ef46fed5da1861a14a532691bcc3e52 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 27 12:16:16 2012 +0000 hostapd: Make systemd unit file independent from network.service. Within the startup of network.service, hostapd needs to be started which will cause a deadlock. This patch removes the requirement of hostapd, that the network service has already to be up. commit 5cc0c01311ef0f893f8b541c762e5541b538a956 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 16 12:47:54 2012 +0000 libsolv: Update to recent development version. ----------------------------------------------------------------------- Summary of changes: libsolv/libsolv.nm | 21 +++------------------ ppp/ppp.nm | 4 ++-- ppp/systemd/pppd@.service | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 ppp/systemd/pppd@.service Difference in files: diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 2750d22..5a2e048 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -5,8 +5,8 @@ name = libsolv version = 0.0.0 -git_ver = 0db9d7f -release = 3.git%{git_ver} +git_ver = c02d759 +release = 4.git%{git_ver} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries @@ -33,27 +33,15 @@ build end prepare_cmds - # Remove -Werror from gcc command line. - find . -name CMakeLists.txt | xargs sed -e "s/-Werror//g" -i - - # Do not build bindings, examples and tools. - sed "/bindings/d" -i CMakeLists.txt - sed "/examples/d" -i CMakeLists.txt - sed "/tools/d" -i CMakeLists.txt - # Make sure that libsatsolverext is linked properly to all needed # libraries. echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \${EXPAT_LIBRARY} \${ZLIB_LIBRARY})" \ >> ext/CMakeLists.txt - - # Remove the RPM stuff when we build with -DFEDORA=1 because we - # do not support RPM. - sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt end build mkdir build - cd build && cmake .. -DFEDORA=1 \ + cd build && cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 @@ -62,9 +50,6 @@ build install cd build && make install DESTDIR=%{BUILDROOT} - - # Remove unusable header. - rm -vf %{BUILDROOT}/usr/include/solv/repo_rpmdb.h end end diff --git a/ppp/ppp.nm b/ppp/ppp.nm index f82be75..8a0ab3f 100644 --- a/ppp/ppp.nm +++ b/ppp/ppp.nm @@ -5,7 +5,7 @@ name = ppp version = 2.4.5 -release = 3 +release = 4 groups = System/Daemons url = ftp://ftp.samba.org/pub/ppp/ @@ -34,7 +34,7 @@ build CFLAGS += -fPIC prepare_cmds - sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \ + sed -e "s@^RUNDIR .*@RUNDIR = /run/ppp@" \ -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \ -i linux/Makefile.top diff --git a/ppp/systemd/pppd@.service b/ppp/systemd/pppd@.service new file mode 100644 index 0000000..a99c7cc --- /dev/null +++ b/ppp/systemd/pppd@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Point-to-Point protocol daemon on %I +BindTo=dev-%I.device +After=dev-%I.device + +[Service] +Type=forking +ExecStartPre=/usr/lib/network/helpers/pppd-config-helper create %I +ExecStart=/usr/sbin/pppd file /run/network/ppp/%I/pppd.conf +ExecStopPost=/usr/lib/network/helpers/pppd-config-helper remove %I +PIDFile=/run/ppp-%I.pid +Restart=failure +UtmpIdentifier=%I +KillMode=process hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9901f43c0befba1a781b844760a68b4f4fd74cf6
by git＠ipfire.org 21 Jun '12

21 Jun '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 9901f43c0befba1a781b844760a68b4f4fd74cf6 (commit) from a965b2ddd4d401dea070c75b38150b87f8fb3da6 (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 9901f43c0befba1a781b844760a68b4f4fd74cf6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 21 14:43:33 2012 +0200 strongswan: Update to 5.0.0rc1. ----------------------------------------------------------------------- Summary of changes: strongswan/strongswan.nm | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) Difference in files: diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index ce84158..fd88d43 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,13 +4,14 @@ ############################################################################### name = strongswan -version = 4.6.3 -release = 1 +version = 5.0.0 +release = 0.1.rc1 +thisapp = %{name}-%{version}rc1 groups = Networking/VPN url = http://www.strongswan.org/ license = GPL -summary = IPsec and IKEv1 implementation for Linux 2.4 and 2.6 kernels. +summary = IPsec (IKEv1 + IKEv2) implementation for Linux. description StrongSwan is a complete IPsec and IKEv1 implementation for @@ -20,6 +21,7 @@ description end source_dl = http://download.strongswan.org/ +sources = %{thisapp}.tar.bz2 build requires hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a965b2ddd4d401dea070c75b38150b87f8fb3da6
by git＠ipfire.org 20 Jun '12

20 Jun '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 a965b2ddd4d401dea070c75b38150b87f8fb3da6 (commit) from 5b1f5bb1ea7de4ed03ed6b88eccbdc1599f44a01 (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 a965b2ddd4d401dea070c75b38150b87f8fb3da6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jun 20 18:36:59 2012 +0200 newt: Fix packaging of python-newt on x86_64. ----------------------------------------------------------------------- Summary of changes: newt/newt.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/newt/newt.nm b/newt/newt.nm index e1092b7..94ef180 100644 --- a/newt/newt.nm +++ b/newt/newt.nm @@ -5,7 +5,7 @@ name = newt version = 0.52.13 -release = 1 +release = 2 groups = System/Libraries url = https://fedorahosted.org/releases/n/e/newt/ @@ -58,7 +58,7 @@ packages end files - /usr/lib/python*/site-packages/*snack* + %{libdir}/python*/site-packages/*snack* end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f7fcbf2ad6c6f5922f35360bf3a81b80c4d196b
by git＠ipfire.org 20 Jun '12

20 Jun '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 6f7fcbf2ad6c6f5922f35360bf3a81b80c4d196b (commit) from 6140e7e0c2bac4e885abf230855965b38e689a92 (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 6f7fcbf2ad6c6f5922f35360bf3a81b80c4d196b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 20 20:53:10 2012 +0200 openvpn: Properly handle fragment size. Allow settings FRAGMENT=0. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 2b4c1fd..92bab47 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -359,7 +359,7 @@ sub writeserverconf { if ($sovpnsettings{MSSFIX} eq 'on') { print CONF "mssfix\n"; } - if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { + if (($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{FRAGMENT} ne 0) && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2012