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 226ae85e8bd1735403a9817fafc8ffbed848b4ea (commit) via f2ed7b80d95dce61cbece32dd3096b9de7aa1e2f (commit) via 249f9516706aafd6a27261672a3f75079aecca0e (commit) via 9252e532f9f1d0bb93a3c3e5a196e161cc57569d (commit) via 3b828b028ea922d55cbadf7035c9df7a36e1464a (commit) via d51784276a43b567b282f703e0853395c5176e71 (commit) via 9d2ad5e3de995b394528d567cf950a8ce863f099 (commit) via 0c2f2c2d3c3453a969e218b5b1467f80fe4565b6 (commit) via 64ece2d4217c386758af6ba322c1bebbb69d7644 (commit) via bfabb32337634b1785f809ea823618f1c258e1b3 (commit) via a3368ae4e437d8abc97fa405c88a382abc17b291 (commit) via b28ed22c54002f748312dec407118576d39e3969 (commit) via db10c9e2539f9f66209ad12a59c64b456acc975d (commit) via 9aee0bab4b0e989798d1edb4da02149a5e8de638 (commit) via 0f3c5dcf8ba52275841ce85e443554ce04154b41 (commit) via d0085d73aadb179aa2bdf1291f701de73ccbbbcc (commit) via d885ecb13dcda6bb4683c493df62351a5a552c72 (commit) from 133191284063ceedbb37ccb6e904675362038392 (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 226ae85e8bd1735403a9817fafc8ffbed848b4ea Merge: f2ed7b8 1331912 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 00:41:19 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Conflicts: gcc/gcc.nm
commit f2ed7b80d95dce61cbece32dd3096b9de7aa1e2f Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:45:38 2011 +0100
diffutils: Fix wrong installation of manpages.
...and activate testsuite.
commit 249f9516706aafd6a27261672a3f75079aecca0e Merge: 9252e53 64ece2d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:28:44 2011 +0100
Merge remote-tracking branch 'stevee/systemd'
commit 9252e532f9f1d0bb93a3c3e5a196e161cc57569d Merge: 3b828b0 a3368ae Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:28:40 2011 +0100
Merge remote-tracking branch 'stevee/systemd-emergency'
commit 3b828b028ea922d55cbadf7035c9df7a36e1464a Merge: d517842 0c2f2c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:27:48 2011 +0100
Merge remote-tracking branch 'stevee/audit'
Conflicts: audit/audit.nm
commit d51784276a43b567b282f703e0853395c5176e71 Merge: 9d2ad5e b28ed22 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:24:04 2011 +0100
Merge remote-tracking branch 'maniacikarus/ids'
Conflicts: suricata/suricata.nm
commit 9d2ad5e3de995b394528d567cf950a8ce863f099 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 18 23:21:13 2011 +0100
gcc: Replace libgcc-devel package correctly.
Fix creation of broken symlink.
commit 0c2f2c2d3c3453a969e218b5b1467f80fe4565b6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Dec 18 18:53:10 2011 +0100
audit: Add -debuginfo package.
commit 64ece2d4217c386758af6ba322c1bebbb69d7644 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Dec 17 22:54:43 2011 +0100
systemd: Update to version 37.
commit bfabb32337634b1785f809ea823618f1c258e1b3 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Dec 17 22:15:49 2011 +0100
systemd: Add patch for branding.
Also specify that our distribution has plymouth.
commit a3368ae4e437d8abc97fa405c88a382abc17b291 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Dec 17 18:41:42 2011 +0100
sysvinit: Build sulogin for systemd emergency mode.
The build of the binary was disabled in the past, so I had to edit our patch to enable build of sulogin.
Fixes #302
commit b28ed22c54002f748312dec407118576d39e3969 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Thu Dec 15 21:48:29 2011 +0000
suricata: Updated to current stable 1.1.1
Fixes
- Fixed a bug that make the SMTP parser crash on certain traffic. - AF_PACKET compilation on modern Linux versions (such as Fedora 16) was fixed.
commit db10c9e2539f9f66209ad12a59c64b456acc975d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Dec 10 17:40:06 2011 +0100
audit: Add folder for logfiles.
commit 9aee0bab4b0e989798d1edb4da02149a5e8de638 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Nov 15 21:44:15 2011 +0100
audit: Add systemd service file.
commit 0f3c5dcf8ba52275841ce85e443554ce04154b41 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Nov 15 21:04:33 2011 +0100
audit: Move python bindings to a seperate package.
commit d0085d73aadb179aa2bdf1291f701de73ccbbbcc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Nov 15 20:56:04 2011 +0100
audit: Activate testsuite.
commit d885ecb13dcda6bb4683c493df62351a5a552c72 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Nov 15 20:55:34 2011 +0100
audit: Update to 2.1.3.
-----------------------------------------------------------------------
Summary of changes: audit/audit.nm | 38 +++++++++++++++++- audit/systemd/auditd.service | 11 +++++ diffutils/diffutils.nm | 10 ++-- gcc/gcc.nm | 8 +++- suricata/suricata.nm | 4 +- systemd/patches/systemd-ipfire.patch | 42 ++++++++++++++++++++ systemd/systemd.nm | 9 ++-- .../patches/sysvinit-2.86-remove-utils-1.patch | 16 +++++--- sysvinit/sysvinit.nm | 2 +- 9 files changed, 117 insertions(+), 23 deletions(-) create mode 100644 audit/systemd/auditd.service create mode 100644 systemd/patches/systemd-ipfire.patch
Difference in files: diff --git a/audit/audit.nm b/audit/audit.nm index 5e36fbb..66017be 100644 --- a/audit/audit.nm +++ b/audit/audit.nm @@ -4,8 +4,8 @@ ###############################################################################
name = audit -version = 2.0.5 -release = 1 +version = 2.1.3 +release = 7
groups = System/Daemons url = http://people.redhat.com/sgrubb/audit/ @@ -44,6 +44,10 @@ build autoreconf -fvi end
+ test + make check + end + install_cmds rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so @@ -52,12 +56,33 @@ build mkdir -pv %{BUILDROOT}/usr/sbin/ mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
+ mkdir -pv %{BUILDROOT}/var/log/audit + rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig} end end
packages package %{name} + prerequires += systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable auditd.service >/dev/null 2>&1 || : + /bin/systemctl stop auditd.service >/dev/null 2>&1 || : + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart auditd.service >/dev/null 2>&1 || : + end end
package %{name}-libs @@ -68,6 +93,15 @@ packages template DEVEL end
+ package python-%{name} + summary = Python bindings for libaudit. + description = %{summary} + + files + /usr/lib/python*/ + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/audit/systemd/auditd.service b/audit/systemd/auditd.service new file mode 100644 index 0000000..04b0b36 --- /dev/null +++ b/audit/systemd/auditd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Security Auditing Service +After=syslog.target + +[Service] +ExecStart=/sbin/auditd -n +ExecStartPost=/sbin/auditctl -R /etc/audit/audit.rules + +[Install] +WantedBy=multi-user.target + diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index 9d676c3..ac42c03 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -5,7 +5,7 @@
name = diffutils version = 3.2 -release = 2 +release = 3
groups = Development/Tools url = http://www.gnu.org/software/diffutils/diffutils.html @@ -23,11 +23,11 @@ source_dl = http://ftp.gnu.org/gnu/diffutils/
build configure_options += \ - --mandir=/usr/share + --mandir=/usr/share/man
- #test - # make check - #end + test + make check + end end
packages diff --git a/gcc/gcc.nm b/gcc/gcc.nm index c650b71..7ec6485 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc version = 4.6.2 -release = 6 +release = 7
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -255,7 +255,7 @@ build
# libquadmath if [ "%{build_libquadmath}" = "1" ]; then - ln -svf ../../../libquadmath.so.0.* ${FULLPATH}/libquadmath.so + ln -svf ../../../libquadmath.so.0.0.0 ${FULLPATH}/libquadmath.so chmod 755 %{BUILDROOT}/usr/lib/libquadmath.so.0.* fi end @@ -279,6 +279,10 @@ packages libgomp=%{thisver} end
+ # We do not ship libgcc-devel anymore. + provides += libgcc-devel=%{thisver} + obsoletes += libgcc-devel<%{thisver} + if "%{build_cloog_ppl}" == "1" requires += cloog-ppl>=0.15 end diff --git a/suricata/suricata.nm b/suricata/suricata.nm index f06c66c..2b94537 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -4,8 +4,8 @@ ###############################################################################
name = suricata -version = 1.1 -release = 2 +version = 1.1.1 +release = 1
groups = Networking/IDS url = http://www.openinfosecfoundation.org/ diff --git a/systemd/patches/systemd-ipfire.patch b/systemd/patches/systemd-ipfire.patch new file mode 100644 index 0000000..4cf071a --- /dev/null +++ b/systemd/patches/systemd-ipfire.patch @@ -0,0 +1,42 @@ +diff -Nur systemd-37_orig/configure.ac systemd-37/configure.ac +--- systemd-37_orig/configure.ac 2011-10-11 20:46:56.000000000 +0200 ++++ systemd-37/configure.ac 2011-12-17 21:57:31.748682566 +0100 +@@ -355,7 +355,7 @@ + + AC_PATH_PROG([M4], [m4]) + +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, ipfire or other])) + if test "z$with_distro" = "z"; then + if test "$cross_compiling" = yes; then + AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) +@@ -374,6 +374,7 @@ + if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then + with_distro="ubuntu" + fi ++ test -f "/etc/ipfire-release" && with_distro="ipfire" + fi + if test "z$with_distro" = "z"; then + with_distro=`uname -s` +@@ -458,6 +459,13 @@ + AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström]) + M4_DEFINES=-DTARGET_ANGSTROM=1 + ;; ++ ipfire) ++ SYSTEM_SYSVINIT_PATH= ++ SYSTEM_SYSVRCND_PATH= ++ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) ++ M4_DEFINES=-DTARGET_IPFIRE=1 ++ have_plymouth=yes ++ ;; + other) + ;; + *) +@@ -515,6 +523,7 @@ + AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) + AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) + AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) ++AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) + + AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes") + AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") diff --git a/systemd/systemd.nm b/systemd/systemd.nm index d8032c2..50b38d9 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################
name = systemd -version = 36 -release = 5 +version = 37 +release = 1
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -30,6 +30,7 @@ build docbook-utils docbook-xsl gperf + gettext-devel intltool libacl-devel libcap-devel @@ -44,9 +45,7 @@ build --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-rootdir= \ - --with-distro=other \ - --with-sysvinit-path= \ - --with-sysvrcd-path= \ + --with-distro=ipfire \ --with-udevrulesdir=/lib/udev/rules.d/ \ --with-pamlibdir=/lib/security
diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch index b3c22ef..8e6881d 100644 --- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch +++ b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch @@ -1,6 +1,6 @@ ---- sysvinit-2.86/src/Makefile.old 2009-08-05 17:57:57.000000000 +0200 -+++ sysvinit-2.86/src/Makefile 2009-08-05 19:03:04.000000000 +0200 -@@ -10,32 +10,26 @@ +--- sysvinit-2.86/src/Makefile.old 2004-06-09 14:47:45.000000000 +0200 ++++ sysvinit-2.86/src/Makefile 2011-12-17 18:20:12.067186698 +0100 +@@ -10,32 +10,30 @@
CC = gcc CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE @@ -26,19 +26,23 @@ -USRBIN += utmpdump wall -MAN1 += mountpoint.1 wall.1 -MAN8 += sulogin.8 bootlogd.8 ++SBIN += sulogin +USRBIN += utmpdump +MAN1 += mountpoint.1 ++MAN8 += sulogin.8 endif
ifeq ($(DISTRO),Debian) BIN += mountpoint -SBIN += sulogin bootlogd ++SBIN += sulogin MAN1 += mountpoint.1 -MAN8 += sulogin.8 bootlogd.8 ++MAN8 += sulogin.8 endif
ifeq ($(DISTRO),Owl) -@@ -50,7 +44,7 @@ +@@ -50,7 +48,7 @@ MANDIR = /usr/share/man
# Additional libs for GNU libc. @@ -47,7 +51,7 @@ LCRYPT = -lcrypt endif
-@@ -120,14 +114,10 @@ +@@ -120,14 +118,10 @@ $(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \ done # $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/ @@ -62,7 +66,7 @@ for i in $(MAN1); do \ $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \ done -@@ -137,12 +127,3 @@ +@@ -137,12 +131,3 @@ for i in $(MAN8); do \ $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \ done diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm index cdbed7f..5627f76 100644 --- a/sysvinit/sysvinit.nm +++ b/sysvinit/sysvinit.nm @@ -5,7 +5,7 @@
name = sysvinit version = 2.86 -release = 3 +release = 4
groups = System/Base url = https://alioth.debian.org/projects/pkg-sysvinit/
hooks/post-receive -- IPFire 3.x development tree