diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2006-06-25 22:17:24 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2006-06-25 22:17:24 +0000 |
| commit | ec5ad208c4f95665bb858681af00feeb9403237d (patch) | |
| tree | c729d3cd45049684c2b0f1afb5c6f350672dc4fe | |
| parent | f53ea85a44aadb8b7df71488b42830b5b2ae056b (diff) | |
| download | vyos-strongswan-ec5ad208c4f95665bb858681af00feeb9403237d.tar.gz vyos-strongswan-ec5ad208c4f95665bb858681af00feeb9403237d.zip | |
- Advances in packaging strongswan.
- New upstream tarball.
| -rw-r--r-- | debian/linux-patch-strongswan.dirs | 2 | ||||
| -rwxr-xr-x | debian/rules | 16 | ||||
| -rw-r--r-- | debian/use-bash.diff | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/debian/linux-patch-strongswan.dirs b/debian/linux-patch-strongswan.dirs index 57f41cb32..7101a7cb5 100644 --- a/debian/linux-patch-strongswan.dirs +++ b/debian/linux-patch-strongswan.dirs @@ -1,3 +1,3 @@ usr/src/kernel-patches/all/apply usr/src/kernel-patches/all/unpatch -usr/src/kernel-patches/all/openswan +usr/src/kernel-patches/all/strongswan diff --git a/debian/rules b/debian/rules index 71c5bea53..5e5fb9746 100755 --- a/debian/rules +++ b/debian/rules @@ -51,9 +51,6 @@ build-stamp: patch # remove the temporary file, it will be created during install rm -f $(CURDIR)/debian/ipsec.secrets - # here we re-generate the upstream HTML documentation - $(MAKE) -C doc/ index.html - # also generate the fswcert tool #$(MAKE) -C programs/fswcert/ # ugly hack.... @@ -174,10 +171,10 @@ install-strongswan-modules-source: patch mkdir -p "$(BUILDDIR)/modules/strongswan/lib" mkdir -p "$(BUILDDIR)/modules/strongswan/debian" mkdir -p "$(BUILDDIR)/modules/strongswan/packaging" - cp -r Makefile Makefile.top Makefile.inc Makefile.ver linux/ \ + cp -r Makefile Makefile.inc Makefile.ver linux/ \ "$(BUILDDIR)/modules/strongswan" cp -r lib/libcrypto "$(BUILDDIR)/modules/strongswan/lib/" - cp -r packaging/makefiles packaging/linus packaging/defaults/ \ + cp -r packaging/makefiles packaging/linus \ "$(BUILDDIR)/modules/strongswan/packaging/" find "$(BUILDDIR)/modules/strongswan/lib/" -name "*.o" | xargs --no-run-if-empty rm install --mode=644 debian/strongswan-modules-source.kernel-config "$(BUILDDIR)/modules/strongswan/config-all.h" @@ -185,11 +182,6 @@ install-strongswan-modules-source: patch install --mode=644 debian/strongswan-modules-source.control.in "$(BUILDDIR)/modules/strongswan/debian/control.in" install --mode=644 debian/changelog "$(BUILDDIR)/modules/strongswan/debian/" - # This creates the NAT-T patches that can be used on the kernel tree - # even with strongswan-modules-source. - make nattpatch2.4 > $(BUILDDIR)/modules/strongswan/debian/nat-t-2.4.diff - make nattpatch2.6 > $(BUILDDIR)/modules/strongswan/debian/nat-t-2.6.diff - tar -C $(BUILDDIR) -c modules/ | bzip2 -9 > \ "$(PKGDIR)/usr/src/strongswan-modules.tar.bz2" @@ -212,8 +204,8 @@ install-linux-patch-strongswan: patch "$(PKGDIR)/usr/src/kernel-patches/all/unpatch/strongswan" install --mode=0755 packaging/utils/patcher \ "$(PKGDIR)/usr/src/kernel-patches/all/strongswan" - cp -r Makefile Makefile.inc Makefile.ver Makefile.top lib/ linux/ \ - packaging/ nat-t/ \ + cp -r Makefile Makefile.inc Makefile.ver lib/ linux/ \ + packaging/ \ "$(PKGDIR)/usr/src/kernel-patches/all/strongswan" # also don't generate the out.kpatch file under /usr/src/.... sed 's/>>out.kpatch//' \ diff --git a/debian/use-bash.diff b/debian/use-bash.diff index ccee7f27e..6d0c922df 100644 --- a/debian/use-bash.diff +++ b/debian/use-bash.diff @@ -1,4 +1,4 @@ 1c1 -< #!/bin/sh +< #! /bin/sh --- > #!/bin/bash |