diff options
| author | Mikhail Kolesnik <mike@openbunker.org> | 2007-10-10 13:15:02 +0300 |
|---|---|---|
| committer | Mikhail Kolesnik <mike@openbunker.org> | 2007-10-10 13:15:02 +0300 |
| commit | b39e8556a17d0f4cc6a0ec6ea45c7566bf0d78c1 (patch) | |
| tree | 739d422562818cdae95c39ce6004c316363ef357 | |
| parent | 8441a70904a30595d42939b318d330b97b53e4d2 (diff) | |
| download | contrib-b39e8556a17d0f4cc6a0ec6ea45c7566bf0d78c1.tar.gz contrib-b39e8556a17d0f4cc6a0ec6ea45c7566bf0d78c1.tar.xz | |
ebtables: updated to 2.0.8-2
| -rw-r--r-- | ebtables/.md5sum | 4 | ||||
| -rw-r--r-- | ebtables/Pkgfile | 4 | ||||
| -rw-r--r-- | ebtables/ebtables-makefile.diff | 29 |
3 files changed, 14 insertions, 23 deletions
diff --git a/ebtables/.md5sum b/ebtables/.md5sum index 7968f377b..3b25fb9fa 100644 --- a/ebtables/.md5sum +++ b/ebtables/.md5sum @@ -1,2 +1,2 @@ -8909d09fb6462c86fa922e6c3c6bbb28 ebtables-makefile.diff -216e5d20fbd0e56dbe7e56b0d07b1909 ebtables-v2.0.8-1.tar.gz +6af35119bbceba5097bbb0d8c89385d6 ebtables-makefile.diff +66bcbcb2dcf3b981ad4e86e1720e796e ebtables-v2.0.8-2.tar.gz diff --git a/ebtables/Pkgfile b/ebtables/Pkgfile index 7e98e3de4..657e0577a 100644 --- a/ebtables/Pkgfile +++ b/ebtables/Pkgfile @@ -4,14 +4,14 @@ # Depends on: name=ebtables -version=2.0.8-1 +version=2.0.8-2 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-v$version.tar.gz \ $name-makefile.diff) build() { cd $name-v$version - patch -p1 -i ../$name-makefile.diff + patch -p1 -i $SRC/$name-makefile.diff make make DESTDIR=$PKG install rm -rf $PKG/etc/{rc.d,sysconfig} diff --git a/ebtables/ebtables-makefile.diff b/ebtables/ebtables-makefile.diff index 8affc6bbb..2aed9daa5 100644 --- a/ebtables/ebtables-makefile.diff +++ b/ebtables/ebtables-makefile.diff @@ -1,7 +1,7 @@ -diff -Nru ebtables-v2.0.8-rc3-orig/Makefile ebtables-v2.0.8-rc3/Makefile ---- ebtables-v2.0.8-rc3-orig/Makefile 2007-02-18 19:35:42.228506482 +0200 -+++ ebtables-v2.0.8-rc3/Makefile 2007-02-18 20:09:33.866567357 +0200 -@@ -12,15 +12,15 @@ +diff -Nru ebtables-v2.0.8-2-orig/Makefile ebtables-v2.0.8-2/Makefile +--- ebtables-v2.0.8-2-orig/Makefile 2007-09-21 20:27:20.000000000 +0300 ++++ ebtables-v2.0.8-2/Makefile 2007-10-10 12:57:08.254461064 +0300 +@@ -8,10 +8,10 @@ # default paths LIBDIR:=/usr/lib @@ -15,24 +15,15 @@ diff -Nru ebtables-v2.0.8-rc3-orig/Makefile ebtables-v2.0.8-rc3/Makefile SYSCONFIGDIR:=/etc/sysconfig DESTDIR:= - # include DESTDIR param --override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME) -+override LIBDIR:=$(DESTDIR)$(LIBDIR) - override MANDIR:=$(DESTDIR)$(MANDIR) - override BINDIR:=$(DESTDIR)$(BINDIR) - override ETCDIR:=$(DESTDIR)$(ETCDIR) -@@ -167,11 +167,11 @@ - .PHONY: scripts - scripts: ebtables-save ebtables.sysv ebtables-config +@@ -156,9 +156,9 @@ cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ -- install -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save -+ install -D -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save + install -m 0755 -o root -g root 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_ $(INITDIR)/ebtables -+ install -D -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables +- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables ++ install -D -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ -- install -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config -+ install -D -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config +- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config ++ install -D -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ $(MANDIR)/man8/ebtables.8: ebtables.8 |