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 641e1aee4bd3d996c96e611c1d1641a425a8508a (commit) via 4598ee07beb8d02589cead33a64169969b2135bb (commit) via 81f830d6ec4b73cf117d5eda889857c48fc4679b (commit) from a6ed23c7be93e8e9efe495642c706f30da2d6a11 (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 641e1aee4bd3d996c96e611c1d1641a425a8508a Merge: 4598ee0 81f830d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 8 00:06:24 2011 +0100
Merge remote-tracking branch 'maniacikarus/ebtables'
commit 4598ee07beb8d02589cead33a64169969b2135bb Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 8 00:04:54 2011 +0100
mpfr: Update to 3.1.0.
Add compat package to transit from 2.4.x versions.
commit 81f830d6ec4b73cf117d5eda889857c48fc4679b Author: Christian Schmidt christian.schmidt@ipfire.org Date: Wed Dec 7 21:23:02 2011 +0000
ebtables: Updated to latest stable 2.0.10.3
Fixes #298
-----------------------------------------------------------------------
Summary of changes: ebtables/ebtables.nm | 6 +- ebtables/patches/ebtables-2.0.8-cflags.patch | 19 ---- ebtables/patches/ebtables-2.0.8-norootinst.patch | 63 ------------- ebtables/patches/ebtables-2.0.9-lsb.patch | 106 ---------------------- mpfr/mpfr.nm | 21 ++++- 5 files changed, 21 insertions(+), 194 deletions(-) delete mode 100644 ebtables/patches/ebtables-2.0.8-cflags.patch delete mode 100644 ebtables/patches/ebtables-2.0.8-norootinst.patch delete mode 100644 ebtables/patches/ebtables-2.0.9-lsb.patch
Difference in files: diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm index 212bf7b..3ace478 100644 --- a/ebtables/ebtables.nm +++ b/ebtables/ebtables.nm @@ -4,8 +4,8 @@ ###############################################################################
name = ebtables -version = v2.0.9-2 -release = 2 +version = v2.0.10-3 +release = 1
groups = Networking/Tools url = http://ebtables.sourceforge.net/ @@ -18,7 +18,7 @@ description layer filtering and some basic filtering on higher network layers. end
-source_dl = +source_dl = http://downloads.sourceforge.net/ebtables/
build CFLAGS += -Wall diff --git a/ebtables/patches/ebtables-2.0.8-cflags.patch b/ebtables/patches/ebtables-2.0.8-cflags.patch deleted file mode 100644 index 1e34a9e..0000000 --- a/ebtables/patches/ebtables-2.0.8-cflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up ebtables-v2.0.8-1/extensions/Makefile.BAD ebtables-v2.0.8-1/extensions/Makefile ---- ebtables-v2.0.8-1/extensions/Makefile.BAD 2007-08-23 09:52:37.000000000 -0400 -+++ ebtables-v2.0.8-1/extensions/Makefile 2007-08-23 09:52:50.000000000 -0400 -@@ -11,13 +11,13 @@ EXT_LIBSI+=$(foreach T,$(EXT_FUNC), -leb - EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T)) - - extensions/ebt_%.so: extensions/ebt_%.o -- $(CC) -shared -o $@ -lc $< -nostartfiles -+ $(CC) $(CFLAGS) -shared -o $@ -lc $< -nostartfiles - - extensions/libebt_%.so: extensions/ebt_%.so - mv $< $@ - - extensions/ebtable_%.so: extensions/ebtable_%.o -- $(CC) -shared -o $@ -lc $< -nostartfiles -+ $(CC) $(CFLAGS) -shared -o $@ -lc $< -nostartfiles - - extensions/libebtable_%.so: extensions/ebtable_%.so - mv $< $@ diff --git a/ebtables/patches/ebtables-2.0.8-norootinst.patch b/ebtables/patches/ebtables-2.0.8-norootinst.patch deleted file mode 100644 index d475928..0000000 --- a/ebtables/patches/ebtables-2.0.8-norootinst.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up ebtables-v2.0.8-2/Makefile.orig ebtables-v2.0.8-2/Makefile ---- ebtables-v2.0.8-2/Makefile.orig 2007-09-21 13:27:20.000000000 -0400 -+++ ebtables-v2.0.8-2/Makefile 2007-10-28 15:09:01.000000000 -0400 -@@ -154,28 +154,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's// - .PHONY: scripts - scripts: ebtables-save ebtables.sysv ebtables-config - cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ -- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save -+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save - cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ -- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables -+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables - cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ -- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config -+ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config - rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ - - $(MANDIR)/man8/ebtables.8: ebtables.8 - mkdir -p $(DESTDIR)$(@D) - sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_ -- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ -+ install -m 0644 ebtables.8_ $(DESTDIR)$@ - rm -f ebtables.8_ - - $(ETHERTYPESFILE): ethertypes - mkdir -p $(DESTDIR)$(@D) -- install -m 0644 -o root -g root $< $(DESTDIR)$@ -+ install -m 0644 $< $(DESTDIR)$@ - - .PHONY: exec - exec: ebtables ebtables-restore - mkdir -p $(DESTDIR)$(BINDIR) -- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore -+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) -+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore - - .PHONY: install - install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts -@@ -199,18 +199,18 @@ release: - rm -f extensions/ebt_inat.c - rm -rf $(CVSDIRS) - mkdir -p include/linux/netfilter_bridge -- install -m 0644 -o root -g root \ -+ install -m 0644 \ - $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/ - # To keep possible compile error complaints about undefined ETH_P_8021Q - # off my back -- install -m 0644 -o root -g root \ -+ install -m 0644 \ - $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/ -- install -m 0644 -o root -g root \ -+ install -m 0644 \ - $(KERNEL_INCLUDES)/linux/types.h include/linux/ -- install -m 0644 -o root -g root \ -+ install -m 0644 \ - $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \ - include/linux/netfilter_bridge/ -- install -m 0644 -o root -g root \ -+ install -m 0644 \ - include/ebtables.h include/linux/netfilter_bridge/ - make clean - touch * diff --git a/ebtables/patches/ebtables-2.0.9-lsb.patch b/ebtables/patches/ebtables-2.0.9-lsb.patch deleted file mode 100644 index 721deea..0000000 --- a/ebtables/patches/ebtables-2.0.9-lsb.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -up ebtables-v2.0.9-1/ebtables.sysv.lsb ebtables-v2.0.9-1/ebtables.sysv ---- ebtables-v2.0.9-1/ebtables.sysv.lsb 2010-01-15 11:39:31.000000000 +0100 -+++ ebtables-v2.0.9-1/ebtables.sysv 2010-01-15 12:52:24.000000000 +0100 -@@ -18,9 +18,9 @@ source /etc/sysconfig/network - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x __EXEC_PATH__/ebtables ] || exit 1 --[ -x __EXEC_PATH__/ebtables-save ] || exit 1 --[ -x __EXEC_PATH__/ebtables-restore ] || exit 1 -+[ -x __EXEC_PATH__/ebtables ] || exit 5 -+[ -x __EXEC_PATH__/ebtables-save ] || exit 5 -+[ -x __EXEC_PATH__/ebtables-restore ] || exit 5 - - RETVAL=0 - prog="ebtables" -@@ -39,6 +39,7 @@ config=__SYSCONFIG__/$prog-config - [ -f "$config" ] && . "$config" - - start() { -+ [ "$EUID" != "0" ] && exit 4 - echo -n $"Starting $desc ($prog): " - if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then - for table in $(ls __SYSCONFIG__/ebtables.* 2>/dev/null | sed -e 's/.*ebtables.//' -e '/save/d' ); do -@@ -50,7 +51,7 @@ start() { - - if [ $RETVAL -eq 0 ]; then - success "$prog startup" -- rm -f /var/lock/subsys/$prog -+ touch "/var/lock/subsys/$prog" - else - failure "$prog startup" - fi -@@ -58,6 +59,7 @@ start() { - } - - stop() { -+ [ "$EUID" != "0" ] && exit 4 - echo -n $"Stopping $desc ($prog): " - for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_([^ ]*).*/\1/'); do - __EXEC_PATH__/ebtables -t $table --init-table || RETVAL=1 -@@ -71,7 +73,7 @@ stop() { - - if [ $RETVAL -eq 0 ]; then - success "$prog shutdown" -- rm -f /var/lock/subsys/$prog -+ rm -f "/var/lock/subsys/$prog" - else - failure "$prog shutdown" - fi -@@ -79,11 +81,13 @@ stop() { - } - - restart() { -+ [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save - stop - start - } - - save() { -+ [ "$EUID" != "0" ] && exit 4 - echo -n $"Saving $desc ($prog): " - if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then - if [ -e __SYSCONFIG__/ebtables ]; then -@@ -116,30 +120,34 @@ save() { - - case "$1" in - start) -+ [ -f "/var/lock/subsys/$prog" ] && exit 0 - start - ;; - stop) - [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save - stop - ;; -- restart|reload) -- [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save -+ restart|force-reload) - restart - ;; -- condrestart) -- [ -e /var/lock/subsys/$prog ] && restart -- RETVAL=$? -+ reload) -+ [ ! -f "/var/lock/subsys/$prog" ] && exit 7 -+ restart -+ ;; -+ condrestart|try-restart) -+ [ ! -e "/var/lock/subsys/$prog" ] && exit 0 -+ restart - ;; - save) - save - ;; - status) -+ [ -f "/var/lock/subsys/$prog" ] && RETVAL=0 || RETVAL=3 - __EXEC_PATH__/ebtables-save -- RETVAL=$? - ;; - *) - echo $"Usage $0 {start|stop|restart|condrestart|save|status}" -- RETVAL=1 -+ RETVAL=2 - esac - - exit $RETVAL diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index da36d02..87d4dbe 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mpfr -version = 3.0.0 +version = 3.1.0 release = 1
groups = System/Libraries @@ -21,11 +21,11 @@ description library. end
-source_dl = +source_dl = http://mpfr.loria.fr/mpfr-%%7Bversion%7D/
build requires - gmp-devel + gmp-devel>=4.3.2 end
configure_options += \ @@ -34,6 +34,11 @@ build test make check end + + install_cmds + ln -svf libmpfr.so.4 %{BUILDROOT}/usr/lib/libmpfr.so.1 + ln -svf libmpfr.so.4.1.0 %{BUILDROOT}/usr/lib/libmpfr.so.1.2.2 + end end
packages @@ -42,4 +47,14 @@ packages package %{name}-devel template DEVEL end + + package %{name}-compat + summary = Compat libraries of %{thisapp}. + + provides = libmpfr.so.1 + + files + /usr/lib/libmpfr.so.1* + end + end end
hooks/post-receive -- IPFire 3.x development tree