--- xtables-addons-1.17.orig/debian/rules +++ xtables-addons-1.17/debian/rules @@ -0,0 +1,240 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# This version is for a hypothetical package that can build a kernel modules +# architecture-dependant package via make-kpkg, as well as an +# architecture-independent module source package, and other packages +# either dep/indep for things like common files or userspace components +# needed for the kernel modules. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +# some default definitions, important! +# +# Name of the source package +psource:=xtables-addons-source + +# The short upstream name, used for the module source directory +sname:=xtables-addons + +# The name of the common userspace package +cname:=xtables-addons-common + +### KERNEL SETUP +### Setup the stuff needed for making kernel module packages +### taken from /usr/share/kernel-package/sample.module.rules + +# prefix of the target package name +PACKAGE=xtables-addons-modules +# modifieable for experiments or debugging m-a +MA_DIR ?= /usr/share/modass + +# If we do not enforce $(CC) value here, then the following include +# will set it to gcc-4.1 +CC = gcc + +# load generic variable handling +-include $(MA_DIR)/include/generic.make +# load default rules, including kdist, kdist_image, ... +-include $(MA_DIR)/include/common-rules.make + + + +# module assistant calculates all needed things for us and sets +# following variables: +# KSRC (kernel source directory), KVERS (kernel version string), KDREV +# (revision of the Debian kernel-image package), CC (the correct +# compiler), VERSION (the final package version string), PKGNAME (full +# package name with KVERS included), DEB_DESTDIR (path to store DEBs) + +# The kdist_config target is called by make-kpkg modules_config and +# by kdist* rules by dependency. It should configure the module so it is +# ready for compilation (mostly useful for calling configure). +# prep-deb-files from module-assistant creates the neccessary debian/ files +kdist_config: prep-deb-files + +# the kdist_clean target is called by make-kpkg modules_clean and from +# kdist* rules. It is responsible for cleaning up any changes that have +# been made by the other kdist_commands (except for the .deb files created) +kdist_clean: + dh_testdir + $(MAKE) -C extensions clean + dh_clean +### end KERNEL SETUP + +include /usr/share/quilt/quilt.make + +configure-stamp: patch configure + dh_testdir + # Add here commands to configure the package. + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + ./configure $(CROSS) --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --libexecdir=/lib +##CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + touch configure-stamp + + +build-arch: configure-stamp build-arch-stamp +build-arch-stamp: + dh_testdir + +# # Add here command to compile/build the package. + $(MAKE) + + touch $@ + +#k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k) + +# the binary-modules rule is invoked by module-assistant while processing the +# kdist* targets. It is called by module-assistant or make-kpkg and *not* +# during a normal build +binary-modules: + dh_testroot + dh_clean -k + dh_installdirs lib/modules/$(KVERS)/kernel/net/netfilter + dh_installdirs lib/modules/$(KVERS)/kernel/net/netfilter/ipset + + # Build the module + $(MAKE) -C extensions modules kbuilddir=$(KSRC) + + # Install the module + $(MAKE) -C extensions modules_install \ + kbuilddir=$(KSRC) \ + DESTDIR=$(CURDIR)/debian/$(PKGNAME) + + rm -f debian/$(PKGNAME)/lib/modules/2.6.*/modules.* + + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_installmodules + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + dh_clean -k + +build-indep: configure-stamp build-indep-stamp +build-indep-stamp: + dh_testdir + + touch $@ + +build: build-arch build-indep + +clean: clean-patched unpatch +clean-patched: + dh_testdir + #dh_testroot + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f extensions/ipset/.*.d + rm -f xtables-addons.8 extensions/matches.man extensions/targets.man + rm -f config.sub config.guess + rm -f build-arch-stamp build-indep-stamp configure-stamp + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Install the libraries + $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cname) + + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian + + # Copy only the driver source to the proper location + cp -r extensions debian/$(psource)/usr/src/modules/$(sname)/ + cp mconfig debian/$(psource)/usr/src/modules/$(sname)/ + + # Copy the needed debian/ pieces to the proper location + cp debian/*modules.in* \ + debian/$(psource)/usr/src/modules/$(sname)/debian + #cp debian/*_KVERS_* debian/rules debian/changelog debian/copyright \ + # debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian/ + cp debian/rules debian/changelog debian/copyright \ + debian/compat debian/control \ + debian/$(psource)/usr/src/modules/$(sname)/debian/ + + cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + + dh_install + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_installexamples -i +# dh_install -i +# dh_installmenu -i +# dh_installdebconf -i +# dh_installlogrotate -i +# dh_installemacsen -i +# dh_installpam -i +# dh_installmime -i +# dh_installinit -i +# dh_installcron -i +# dh_installinfo -i + dh_installman -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i +# dh_perl -i +# dh_python -i +# dh_makeshlibs -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installman -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a +# dh_makeshlibs -a + dh_shlibdeps -a + dh_strip -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install binary-modules kdist kdist_configure kdist_image kdist_clean --- xtables-addons-1.17.orig/debian/watch +++ xtables-addons-1.17/debian/watch @@ -0,0 +1,11 @@ +# Example watch control file for uscan +# Run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Find new files on sourceforge, for devscripts >= 2.9 +# http://sf.net/#PACKAGE#/#PACKAGE#-(.*)\.tar\.gz + http://sf.net/xtables-addons/xtables-addons-(.*)\.tar\.bz2 --- xtables-addons-1.17.orig/debian/docs +++ xtables-addons-1.17/debian/docs @@ -0,0 +1 @@ +README --- xtables-addons-1.17.orig/debian/compat +++ xtables-addons-1.17/debian/compat @@ -0,0 +1 @@ +5 --- xtables-addons-1.17.orig/debian/control.modules.in +++ xtables-addons-1.17/debian/control.modules.in @@ -0,0 +1,29 @@ +Source: xtables-addons +Section: unknown +Priority: optional +Maintainer: Pierre Chifflier +Build-Depends: debhelper (>= 7), + iptables-dev, + pkg-config, + kbuild +Standards-Version: 3.8.1 + +Package: xtables-addons-modules-_KVERS_ +Architecture: any +Provides: xtables-addons-modules +Conflicts: ipset +Replaces: ipset +Depends: xtables-addons-common-${source:Upstream-Version} +Description: xtables-addons modules for Linux (kernel _KVERS_). + This package contains the set of loadable kernel modules for the + xtables-addons project. + . + It contains new targets for iptables, such as TARPIT, CHAOS, TEE, geoip, + ipset, IPMARK, DELUDE, condition, etc. + . + This package contains the compiled kernel modules for _KVERS_ + . + If you have compiled your own kernel, you will most likely need to build + your own xtables-addons-modules. The xtables-addons-source package has been + provided for use with the Debian's module-assistant or kernel-package + utilities to produce a version of xtables-addons-modules for your kernel. --- xtables-addons-1.17.orig/debian/copyright +++ xtables-addons-1.17/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Pierre Chifflier on +Sun, 19 Oct 2008 16:11:52 +0200. + +It was downloaded from http://jengelh.medozas.de/projects/xtables/ + +Upstream Author: Jan Engelhardt + +Copyright (C) 2006-2008 Jan Engelhardt + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License 2 can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is (C) 2008, Pierre Chifflier and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. + --- xtables-addons-1.17.orig/debian/changelog +++ xtables-addons-1.17/debian/changelog @@ -0,0 +1,110 @@ +xtables-addons (1.17-1) unstable; urgency=low + + * New Upstream Version + + -- Pierre Chifflier Thu, 18 Jun 2009 16:08:45 +0200 + +xtables-addons (1.16-1) unstable; urgency=low + + * New Upstream Version + + -- Pierre Chifflier Sun, 07 Jun 2009 22:08:15 +0200 + +xtables-addons (1.15-3) unstable; urgency=medium + + * Make xtables-addons-common conflict with ipset (Closes: #528611) + * Urgency medium, serious bug + + -- Pierre Chifflier Thu, 14 May 2009 11:15:40 +0200 + +xtables-addons (1.15-2) unstable; urgency=low + + * Add pkg-config to xtables-addons-source dependencies (Closes: #528169) + + -- Pierre Chifflier Mon, 11 May 2009 17:37:49 +0200 + +xtables-addons (1.15-1) unstable; urgency=low + + * New Upstream Version (Closes: #527254): + This release adds the RAWNAT extension and fixes + subtle leftover bugs in condition, fuzzy, and ipp2p. + * Add build-dep on quilt, and patches (Closes: #517698): + - 10-uncouple-userspace-from-kernel-build.patch + * Re-introduce xtables-addons-common + * Thanks to John Wright for the original patches, merged with modifications + + -- Pierre Chifflier Wed, 06 May 2009 23:08:35 +0200 + +xtables-addons (1.14-2) unstable; urgency=low + + * Add dependency on pkg-config for the source module (Closes: #525088) + * Allow building against kernels different than the running one + (Closes: #525089, #517699) + Thanks to John Wright for the patch. + + -- Pierre Chifflier Wed, 22 Apr 2009 09:17:35 +0200 + +xtables-addons (1.14-1) unstable; urgency=low + + * New Upstream Version + * Bump standards version (no changes) + * Set dependency on iptables-dev >= 1.4.3 + + -- Pierre Chifflier Thu, 02 Apr 2009 15:34:21 +0200 + +xtables-addons (1.12-1) unstable; urgency=low + + * New Upstream Version + * Remove generated map files (Closes: #517699) + + -- Pierre Chifflier Mon, 09 Mar 2009 17:56:57 +0100 + +xtables-addons (1.10-1) unstable; urgency=low + + * New Upstream Version + * Upload to unstable + * Packaging has been rewritten (Closes: #511591) + * Add watch file + * Add postinst file to generated module to call depmod (Closes: #513492) + + -- Pierre Chifflier Wed, 25 Feb 2009 12:16:04 +0100 + +xtables-addons (1.8-1) experimental; urgency=low + + * New upstream release: + Some crashes with ipp2p have been fixed, and the TEE module + gained IPv6 capability. + + -- Pierre Chifflier Tue, 20 Jan 2009 09:43:51 +0100 + +xtables-addons (1.7-2) experimental; urgency=low + + * Remove generated modules.map files from binary module. + + -- Pierre Chifflier Sat, 10 Jan 2009 17:42:43 +0100 + +xtables-addons (1.7-1) experimental; urgency=low + + * Re-write package: + - remove xtables-addons-common package + - put complete modules and libs sources in -source package + * New upstream release: + - update ipset version + - fix build with the latest 2.6.28(-rc) kernel + * Add missing dependency on iptables-dev (Closes: #504563) + + -- Pierre Chifflier Tue, 06 Jan 2009 11:04:05 +0100 + +xtables-addons (1.5.7-2) unstable; urgency=low + + * Fix FTBFS: add headers for all linux versions, and build + for the installed headers version + + -- Pierre Chifflier Mon, 27 Oct 2008 22:31:20 +0100 + +xtables-addons (1.5.7-1) unstable; urgency=low + + * Initial release (Closes: #502402) + + -- Pierre Chifflier Sun, 19 Oct 2008 16:11:52 +0200 + --- xtables-addons-1.17.orig/debian/control +++ xtables-addons-1.17/debian/control @@ -0,0 +1,43 @@ +Source: xtables-addons +Section: admin +Priority: extra +Maintainer: Pierre Chifflier +Build-Depends: debhelper (>= 5), + autotools-dev, + bzip2, + pkg-config, + iptables-dev (>= 1.4.3), + module-assistant, + quilt +Standards-Version: 3.8.1 +Homepage: http://xtables-addons.sourceforge.net/ + +Package: xtables-addons-source +Architecture: all +Depends: module-assistant, + debhelper (>= 5), + make, + pkg-config, + iptables-dev (>= 1.4.3), + bzip2 +Description: Source for the xtables-addons driver + This package provides the source code for the xtables-addons kernel modules. + The xtables-addons package is also required in order to make use of these + modules. Kernel source or headers are required to compile these modules. + +Package: xtables-addons-common +Architecture: any +Depends: ${shlibs:Depends} +Recommends: xtables-addons-modules +Provides: xtables-addons-common-${source:Upstream-Version} +Conflicts: ipset +Replaces: ipset +Description: Userspace components of xtables-addons + This package provides the userspace libraries for iptables to use extensions + in the xtables-addons-modules package. + . + Note: this package is only useful with a correspdonding xtables-addons-modules + package, which you may produce with module-assistant: + . + module-assistant auto-install xtables-addons-source + --- xtables-addons-1.17.orig/debian/README.Debian +++ xtables-addons-1.17/debian/README.Debian @@ -0,0 +1,29 @@ +Conflicts with previous versions +-------------------------------- + +Please note that you will need to remove all versions of xtables-addons-modules-* +prior to 1.15 before installing 1.15. + +If you don't do that, you will get conflicts with xtables-addons-common package. + +xtables-addons for Debian +------------------------- + +The Debian xtables-addons source package provides two packages, + + 1) xtables-addons-common, which the provides the userspace libraries and tools + 2) xtables-addons-source, which provides the source for the kernel modules + +The xtables-addons-source package can be used in several ways, + + - Using the make-kpkg(1) command provided by the kernel-package Debian + package. This will produce a corresponding xtables-addons-modules package for + the Debian kernel-image package that you are using. This is "the Debian + way". See the "modules_image" section of the make-kpkg(1) man page. + + - Changing to the /usr/src/modules/xtables-addons/ directory and building as + the README file instructs using "make; make install". This will build + and install a module specific to the system you are building on and is + not under control of the packaging system. + + -- Pierre Chifflier Wed, 06 May 2009 23:01:23 +0200 --- xtables-addons-1.17.orig/debian/patches/10-uncouple-userspace-from-kernel-build.patch +++ xtables-addons-1.17/debian/patches/10-uncouple-userspace-from-kernel-build.patch @@ -0,0 +1,30 @@ +Index: xtables-addons/extensions/GNUmakefile.in +=================================================================== +--- xtables-addons.orig/extensions/GNUmakefile.in 2009-06-07 22:10:55.000000000 +0200 ++++ xtables-addons/extensions/GNUmakefile.in 2009-06-07 22:11:02.000000000 +0200 +@@ -17,7 +17,6 @@ + libdir := @libdir@ + libexecdir := @libexecdir@ + xtlibdir := @xtlibdir@ +-kbuilddir := @kbuilddir@ + + CC := @CC@ + CCLD := ${CC} +@@ -62,7 +61,7 @@ + + .PHONY: all install clean distclean FORCE + +-all: subdirs modules user matches.man targets.man ++all: subdirs user matches.man targets.man + + subdirs: + @for i in ${subdirs_list}; do ${MAKE} -C $$i; done; +@@ -72,7 +71,7 @@ + + user: ${targets} + +-install: modules_install subdirs-install ${targets_install} ++install: subdirs-install ${targets_install} + @mkdir -p "${DESTDIR}${xtlibdir}"; + install -pm0755 ${targets_install} "${DESTDIR}${xtlibdir}/"; + --- xtables-addons-1.17.orig/debian/patches/series +++ xtables-addons-1.17/debian/patches/series @@ -0,0 +1 @@ +10-uncouple-userspace-from-kernel-build.patch