diff options
author | 2008-05-11 11:04:49 +0000 | |
---|---|---|
committer | 2008-05-11 11:04:49 +0000 | |
commit | ef759680d349979172edb4fb2492143751932f47 (patch) | |
tree | 0916e2ec1ddcba6cbf19820188531f8fba4cc368 /net-firewall | |
parent | Fix broken digest for linux-2.6.24.tar.bz2. (diff) | |
download | gentoo-2-ef759680d349979172edb4fb2492143751932f47.tar.gz gentoo-2-ef759680d349979172edb4fb2492143751932f47.tar.bz2 gentoo-2-ef759680d349979172edb4fb2492143751932f47.zip |
Removed useless postinst message, bug #221031 reported by Denilson. Removed old ebuild.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-firewall')
-rw-r--r-- | net-firewall/ebtables/ChangeLog | 11 | ||||
-rw-r--r-- | net-firewall/ebtables/ebtables-2.0.8.1.ebuild | 46 | ||||
-rw-r--r-- | net-firewall/ebtables/ebtables-2.0.8.2.ebuild | 12 | ||||
-rw-r--r-- | net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch | 11 | ||||
-rw-r--r-- | net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch | 66 |
5 files changed, 11 insertions, 135 deletions
diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog index 445d31493ec2..b30db41fdf52 100644 --- a/net-firewall/ebtables/ChangeLog +++ b/net-firewall/ebtables/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-firewall/ebtables -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.22 2007/11/02 21:44:46 pylon Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.23 2008/05/11 11:04:49 pva Exp $ + + 11 May 2008; Peter Volkov <pva@gentoo.org> + -files/ebtables-2.0.8.1-fix-textrel.patch, + -files/ebtables-2.0.8.1-scripts-build.patch, -ebtables-2.0.8.1.ebuild, + ebtables-2.0.8.2.ebuild: + Removed useless postinst message, bug #221031 reported by Denilson. + Removed old ebuild. 02 Nov 2007; Lars Weiler <pylon@gentoo.org> ebtables-2.0.8.2.ebuild: stable ppc, bug #197750 diff --git a/net-firewall/ebtables/ebtables-2.0.8.1.ebuild b/net-firewall/ebtables/ebtables-2.0.8.1.ebuild deleted file mode 100644 index af829fd82c8a..000000000000 --- a/net-firewall/ebtables/ebtables-2.0.8.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.1.ebuild,v 1.4 2007/09/10 19:20:49 maekke Exp $ - -inherit versionator eutils toolchain-funcs multilib - -MY_PV=$(replace_version_separator 3 '-' ) -MY_P="${PN}-v${MY_PV}" - -DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting." -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -HOMEPAGE="http://ebtables.sourceforge.net/" -KEYWORDS="amd64 ppc x86" -IUSE="" -LICENSE="GPL-2" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -DEPEND="virtual/libc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Kill two rabits: TEXTREL and compilation on amd64. bug #159371. - epatch "${FILESDIR}"/${P}-fix-textrel.patch - - # Fix scripts to be built during make, thus paths inside are correct. - epatch "${FILESDIR}"/${P}-scripts-build.patch - - sed -i -e "s,MANDIR:=/usr/local/man,MANDIR:=/usr/share/man," \ - -e "s,BINDIR:=/usr/local/sbin,BINDIR:=/sbin," \ - -e "s,INITDIR:=/etc/rc.d/init.d,INITDIR:=/usr/share/doc/${PF}," \ - -e "s,SYSCONFIGDIR:=/etc/sysconfig,SYSCONFIGDIR:=/usr/share/doc/${PF}," \ - -e "s,LIBDIR:=/usr/lib,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile -} - -src_compile() { - emake CC="$(tc-getCC)" || die "emake failed" -} - -src_install() { - dodoc ChangeLog THANKS - make DESTDIR="${D}" install || die -} diff --git a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild index 192b6af641a7..c7b60ad7709c 100644 --- a/net-firewall/ebtables/ebtables-2.0.8.2.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.8.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2.ebuild,v 1.4 2007/11/02 21:44:46 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2.ebuild,v 1.5 2008/05/11 11:04:49 pva Exp $ inherit versionator eutils toolchain-funcs multilib @@ -43,11 +43,3 @@ src_install() { newinitd "${FILESDIR}"/ebtables.initd ebtables newconfd "${FILESDIR}"/ebtables.confd ebtables } - -pkg_postinst() { - echo - einfo "If you are interested in gentoo init script for ebtables, please," - einfo "read the following file:" - einfo "/usr/share/doc/${PF}/init-scripts/README.gentoo.init" - echo -} diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch deleted file mode 100644 index 97a5497cabf2..000000000000 --- a/net-firewall/ebtables/files/ebtables-2.0.8.1-fix-textrel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig 2007-08-12 13:02:55.000000000 +0400 -+++ ./Makefile 2007-08-12 13:03:04.000000000 +0400 -@@ -87,7 +87,7 @@ - $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -Iinclude/ - - ebtables.o: ebtables.c include/ebtables_u.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES) -+ $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES) - - ebtables-standalone.o: ebtables-standalone.c include/ebtables_u.h - $(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES) diff --git a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch b/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch deleted file mode 100644 index 798eefda4290..000000000000 --- a/net-firewall/ebtables/files/ebtables-2.0.8.1-scripts-build.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- ./Makefile.orig 2007-08-12 13:25:23.000000000 +0400 -+++ ./Makefile 2007-08-12 13:36:13.000000000 +0400 -@@ -15,15 +15,6 @@ - SYSCONFIGDIR:=/usr/share/doc/ebtables-2.0.8.1 - DESTDIR:= - --# include DESTDIR param --override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME) --override MANDIR:=$(DESTDIR)$(MANDIR) --override BINDIR:=$(DESTDIR)$(BINDIR) --override ETCDIR:=$(DESTDIR)$(ETCDIR) --override INITDIR:=$(DESTDIR)$(INITDIR) --override SYSCONFIGDIR:=$(DESTDIR)$(SYSCONFIGDIR) -- -- - CFLAGS:=-Wall -Wunused - CFLAGS_SH_LIB:=-fPIC - CC:=gcc -@@ -163,34 +154,34 @@ - .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_ $(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 -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 -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 -- mkdir -p $(@D) -+ 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_ $@ -+ install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ - rm -f ebtables.8_ - - $(ETHERTYPESFILE): ethertypes -- mkdir -p $(@D) -- install -m 0644 -o root -g root $< $@ -+ mkdir -p $(DESTDIR)$(@D) -+ install -m 0644 -o root -g root $< $(DESTDIR)$@ - - .PHONY: exec - exec: ebtables ebtables-restore -- mkdir -p $(BINDIR) -- install -m 0755 -o root -g root $(PROGNAME) $(BINDIR)/$(PROGNAME) -- install -m 0755 -o root -g root ebtables-restore $(BINDIR)/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 - - .PHONY: install - install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts -- mkdir -p $(LIBDIR) -- install -m 0755 extensions/*.so $(LIBDIR) -- install -m 0755 *.so $(LIBDIR) -+ mkdir -p $(DESTDIR)$(LIBDIR) -+ install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR) -+ install -m 0755 *.so $(DESTDIR)$(LIBDIR) - - .PHONY: clean - clean: |