Changeset ebc5ae5 for npl/internetserver/dhcp

Timestamp:

01/22/17 18:18:59 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

gcc484, master, ntop, perl-5.22

Children:

0c5671f

Parents:

f2411e4

Message:

upgraded dhcpd to 4.3.6 for better ipv6 support

Location:

npl/internetserver/dhcp

Files:

• _dhcp.tar.gz (deleted)
• dhclient-script.PATH.diff.gz (added)
• dhcommon-getifaddrs.patch (added)
• dhcp-4.2.5.tar.gz (deleted)
• dhcp-4.3.5.tar.gz (added)
• dhcp-remove-bind-tarball.sh (added)
• dhcp.SlackBuild (modified) (1 diff)
• dhcp.SlackBuild.log.gz (modified) (previous)
• dhcp.SlackBuild.orig (added)
• dhcp.arch (modified) (1 prop)
• dhcp.build (modified) (1 diff)
• dhcp.depver (added)
• dhcp.md5 (modified) (1 diff)
• dhcp.pkg (modified) (1 prop) (previous)
• dhcp.version (modified) (1 diff, 1 prop)
• dhcp_dev.arch (added)
• dhcp_dev.build (added)
• dhcp_dev.pkg (added)
• dhcp_dev.version (added)
• doinst.sh.gz (added)
• ipfire-3.x (deleted)
• slack-desc (modified) (1 prop)

npl/internetserver/dhcp/dhcp.SlackBuild

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://mirrors.slackware.com/slackware/slackware-current/source/n/dhcp/
+# Created at Fri Jan 20 21:46:54 CET 2017
 
-# Set initial variables:
+#DEP:bind
+
+########### source original slackbuild (hopefully we dont need to modify it)
 CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=$CWD
-fi
-PKG=$TMP/package-dhcp
+set -e
+source ./dhcp.SlackBuild.orig
 
-VERSION=4.2.5
-ARCH=i386
-BUILD=1
 
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP # location to build the source
-fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
-fi
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
+        
+        #config will be in seperate package
+        rm -rf $PKG/etc 2>/dev/null|| true
 
-# Explode the package framework:
-cd $PKG
-explodepkg $CWD/_dhcp.tar.gz
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
 
-echo "+=============+"
-echo "| dhcp-$VERSION |"
-echo "+=============+"
-cd $TMP
-tar xzvf $CWD/dhcp-$VERSION.tar.gz
-cd dhcp-$VERSION
-
-# Borrowed from https://github.com/ipfire/ipfire-3.x/tree/master/dhcp/patches
-# Apply patches in a special order.
-PATCHES="dhcp-4.2.5-remove-bind.patch \
-        dhcp-4.2.4-P1-remove-dst.patch \
-        dhcp-4.2.0-errwarn-message.patch \
-        dhcp-4.2.0-release-by-ifup.patch \
-        dhcp-4.2.4-unicast-bootp.patch \
-        dhcp-4.2.0-default-requested-options.patch \
-        dhcp-4.2.2-xen-checksum.patch \
-        dhcp-4.2.5-manpages.patch \
-        dhcp-4.2.0-garbage-chars.patch \
-        dhcp-4.2.0-add_timeout_when_NULL.patch \
-        dhcp-4.2.4-64_bit_lease_parse.patch \
-        dhcp-4.2.0-logpid.patch \
-        dhcp-4.2.4-UseMulticast.patch \
-        dhcp-4.2.4-improved-xid.patch \
-        dhcp-4.2.5-systemtap.patch \
-        dhcp-4.2.3-P2-log_perror.patch \
-        dhcp-4.2.4-getifaddrs.patch \
-        dhcp-4.2.4-send_release.patch \
-        dhcp-4.2.5-rfc5970-dhcpv6-options-for-network-boot.patch \
-        dhcp-4.2.4-failOverPeer.patch \
-        dhcp-4.2.5b1-atf-pkgconfig.patch \
-        dhcp-4.2.4-P1-interval.patch \
-        dhcp-4.2.4-P2-conflex-do-forward-updates.patch \
-        dhcp-4.2.4-P2-dupl-key.patch \
-        dhcp-4.2.5-next-server.patch"
-
-for P in $PATCHES ; do
-        echo "Applying patch $P"
-        patch -p1 < $CWD/ipfire-3.x/dhcp/patches/$P || exit 
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
 done
-
-#patch -p1 < $CWD/dhcp-4.2.5-remove-bind.patch || exit 1
-#patch -p1 < $CWD/dhcp-4.2.4-getifaddrs.patch || exit 1
-
-export MAKEFLAGS="-j10"
- ./configure  --enable-ipv4-pktinfo \
-        --disable-static \
-        --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-        --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-        --with-cli-lease-file=/var/state/dhcp/dhclient.leases \
-        --with-cli6-lease-file=/var/state/dhcp/dhclient6.leases  || exit 1
-
-make  DEBUG="-O2 -march=i386 -mcpu=i686" || exit 1
-mkdir -p $PKG/usr/doc/dhcp-$VERSION
-cp -a ANONCVS CHANGES COPYRIGHT README RELNOTES $PKG/usr/doc/dhcp-$VERSION
-mkdir -p $PKG/usr/doc/dhcp-$VERSION/examples
-cp -a client/dhclient.conf server/dhcpd.conf \
-  $PKG/usr/doc/dhcp-$VERSION/examples
-chown -R root.root $PKG/usr/doc/dhcp-$VERSION
-cat << EOF > $PKG/etc/dhcpd.conf.new
-# dhcpd.conf
-#
-# Configuration file for ISC dhcpd (see 'man dhcpd.conf')
-#
-allow unknown-clients;
-ddns-updates off;
-
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.100 192.168.0.254;
-  option domain-name-servers 192.168.0.1,192.168.0.1;
-  option routers 192.168.0.1;
-  option domain-name "";
-}
-EOF
-
-cat << EOF > $PKG/etc/dhclient.conf.new
-# dhclient.conf
-#
-# Configuration file for ISC dhclient (see 'man dhclient.conf')
-#
-EOF
-
-mkdir -p $PKG/service/dhcpd
-cat << EOF > $PKG/service/dhcpd/run
-#!/bin/bash
-exec /usr/sbin/dhcpd -f
-EOF
-
-mkdir -p $PKG/etc/postinst.d
-cp $CWD/post.dhcp $PKG/etc/postinst.d || exit 1
-chmod +x $PKG/etc/postinst.d/post.dhcp || exit 1
-
-chmod +x $PKG/service/dhcpd/run
-cat client/scripts/linux > $PKG/sbin/dhclient-script
-chmod 700 $PKG/sbin/dhclient-script
-( cd work.linux-2.2
-  strip server/dhcpd client/dhclient relay/dhcrelay
-  cat server/dhcpd > $PKG/usr/sbin/dhcpd
-  cat relay/dhcrelay > $PKG/usr/sbin/dhcrelay
-  cat client/dhclient > $PKG/sbin/dhclient )
-mkdir -p $PKG/usr/man/man5
-mkdir -p $PKG/usr/man/man8
-for dir in client server ; do
-  cd $dir
-  for file in *.5 ; do
-    cat $file | sed -e "s#ETCDIR#/etc#g" -e "s#DBDIR#/var/db#g" \
-      -e "s#RUNDIR#/var/run#g" | gzip -9c > $PKG/usr/man/man5/$file.gz
-  done
-  for file in *.8 ; do
-    cat $file | sed -e "s#ETCDIR#/etc#g" -e "s#DBDIR#/var/db#g" \
-      -e "s#RUNDIR#/var/run#g" | gzip -9c > $PKG/usr/man/man8/$file.gz
-  done
-  cd ..
-done
-cat relay/dhcrelay.8 | sed -e "s#ETCDIR#/etc#g" -e "s#DBDIR#/var/db#g" \
-  -e "s#RUNDIR#/var/run#g" | gzip -9c > $PKG/usr/man/man8/dhcrelay.8.gz
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-NAME=`echo $0|cut -f2 -d'.'`
-makepkg -l y -c n $CWD/$NAME.pkg > /dev/null &&
-echo $VERSION > $CWD/$NAME.version &&
-arch > $CWD/$NAME.arch &&
-
-# Clean up the extra stuff:
-if [ ! "$1" = "--nocleanup" ]; then
- rm -rf $TMP/dhcp-$VERSION
- rm -rf $PKG
-fi

npl/internetserver/dhcp/dhcp.build

@@ -1 @@
-6132
+4

npl/internetserver/dhcp/dhcp.md5

@@ -1 @@
-6489e919ac093d17249270ee9be1020e  ./dhcp-4.2.5.tar.gz
-ff2f56a7bf5e429a1d7e3680add1cb32  ./dhcp.pkg
-96ad655b913e372f39410075aa209468  ./dhcp.SlackBuild
-692a1772b4fddf96a780ddc390e03c61  ./dhcp.SlackBuild.log.gz
-11ca796082e450d64b73a03d804ad864  ./_dhcp.tar.gz
-2bae4a4af494aed24918e9cc2935afa4  ./ipfire-3.x/dhcp/dhcp.nm
-c4425c49f15d8a967d980dca4cb91d7e  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
-82ccdfe9f75077b5f77a7787c7faaa08  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-default-requested-options.patch
-745fa4a15be1da98930f666b6041f161  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
-fda8ab215da2a9f55cb3e9a7f76d9afc  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-errwarn-message.patch
-3f012e6381008d6c1f085069850a3bdf  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-garbage-chars.patch
-d588188092bf2fb0997c85cf972fdaf6  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-honor-expired.patch
-3392012a8c190e38874290eac705ddd4  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-logpid.patch
-683e5a5bbd93cef62acf3a1cdb11d7b8  ./ipfire-3.x/dhcp/patches/dhcp-4.2.0-release-by-ifup.patch
-6430a32fd2aade8493332b7705cd3ab5  ./ipfire-3.x/dhcp/patches/dhcp-4.2.1-retransmission.patch
-d87c3e2f859f3ee63b749a64910fdeef  ./ipfire-3.x/dhcp/patches/dhcp-4.2.2-capability.patch
-f0cb1e263a3c87316f8e3a9ce7e0680d  ./ipfire-3.x/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
-22dfef7a39d8cb378f5d8444b772236e  ./ipfire-3.x/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
-3ad4622e40d1b8d478cd4533b4fd962a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.2-xen-checksum.patch
-861c9c2573dd79e4a6c4d25785a89042  ./ipfire-3.x/dhcp/patches/dhcp-4.2.3-dhclient-decline-onetry.patch
-cbf0d0f9b4b4a953c3f20eb063e3fdd2  ./ipfire-3.x/dhcp/patches/dhcp-4.2.3-P2-log_perror.patch
-97d2569f24acc78ad792118e512aa226  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-64_bit_lease_parse.patch
-2659e6e3862415c48741cda58ecc019d  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-dhclient-options.patch
-f6c3bdd6fcc50c1b96158a01adb5bcc5  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-failOverPeer.patch
-ea9ceeacc8229bd77e5a221c73abb90a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-getifaddrs.patch
-deeb3c446d6441f13e54bf735dd55b49  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-improved-xid.patch
-cd0f41a27763b93c8dcd251b8ec12658  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-P1-interval.patch
-d5f6c9a8b114fe12a82ddea86ae18bcd  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-P1-remove-dst.patch
-d5af79a54fb698ba3160160ef865dbc3  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-P2-conflex-do-forward-updates.patch
-9f093a90bb90e4b45f84ff5442605816  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-P2-dupl-key.patch
-16a40aaa9c10fd6dafc5f57c565f835a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-paths.patch
-9f0225ed7d6e10505e40751b031dfcaa  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-send_release.patch
-a25f1559bb3d0a5a4350923dbefd8181  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-unicast-bootp.patch
-c4157436e8abd5be10553b9cbc25a88b  ./ipfire-3.x/dhcp/patches/dhcp-4.2.4-UseMulticast.patch
-f28b1d01f8f8296e38a7e92a3b35c646  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5b1-atf-pkgconfig.patch
-167ab55855269d0c0869dbcac76db642  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-lpf-ib.patch
-44e8d2efa541e0f87c482fdf2c15d9ad  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-manpages.patch
-8f31b8124e70af6e5cd57a4786523e34  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-next-server.patch
-fdf97c7362de5673b85eefd79ca15a5a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-paranoia.patch
-e22bfb2ff03054c35bd2dc9ca700daac  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-PPP.patch
-6d4a27477f68f6d254b41b142dcc175a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-range6.patch
-3350f6746e06d073ea6a60fde11834bd  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-remove-bind.patch
-9ac7c9425ff74195b92f42f4ee28bbb7  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-rfc3442-classless-static-routes.patch
-ee1132370c66c686c6d0a72ef6e7859a  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-rfc5970-dhcpv6-options-for-network-boot.patch
-f2ac47b4d2871738f3f08337977013b1  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-sendDecline.patch
-9ae44ae0251f3fcadfbd65227964712c  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-sharedlib.patch
-a84a4066c29f46f184c350655a94e342  ./ipfire-3.x/dhcp/patches/dhcp-4.2.5-systemtap.patch
-9fa9f7f8ec96e7eab68b5869d853fc11  ./ipfire-3.x/dhcp/systemd/dhclient4@.service
-64eb687d06149412a646d07e0dd46e1e  ./ipfire-3.x/dhcp/systemd/dhcpd6.service
-2a27958dee0cad5fe6758978819b8068  ./ipfire-3.x/dhcp/systemd/dhcpd.service
-572ea60920773a9c67e3f925f171ec07  ./ipfire-3.x/dhcp/systemd/dhcrelay.service
-3290b24cf52a49ee9989cb44655266d4  ./ipfire-3.x/.git/config
-a0a7c3fff21f2aea3cfa1d0316dd816c  ./ipfire-3.x/.git/description
-4cf2d64e44205fe628ddd534e1151b58  ./ipfire-3.x/.git/HEAD
-9cc72dc973e24f9623bd3fe708f60ef5  ./ipfire-3.x/.git/hooks/applypatch-msg.sample
-579a3c1e12a1e74a98169175fb913012  ./ipfire-3.x/.git/hooks/commit-msg.sample
-2b7ea5cee3c49ff53d41e00785eb974c  ./ipfire-3.x/.git/hooks/post-update.sample
-a4a7e457b55b5ac2877f7973dbba37e9  ./ipfire-3.x/.git/hooks/pre-applypatch.sample
-15449d98cfa79704332d057b3f91093c  ./ipfire-3.x/.git/hooks/pre-commit.sample
-7dfe15854212a30f346da5255c1d794b  ./ipfire-3.x/.git/hooks/prepare-commit-msg.sample
-37cd078dc41c68666dd655eb304697b7  ./ipfire-3.x/.git/hooks/pre-push.sample
-3ff6ba9cf6d8e5332978e057559b5562  ./ipfire-3.x/.git/hooks/pre-rebase.sample
-f51b02427757e79621b5235d7efdf117  ./ipfire-3.x/.git/hooks/update.sample
-9f4b2277f50a412e56de6e0306f4afb8  ./ipfire-3.x/.gitignore
-d5acd12e9b9832e17cc05f21f253011f  ./ipfire-3.x/.git/index
-036208b4a1ab4a235d75c181e685e5a3  ./ipfire-3.x/.git/info/exclude
-376eb5d008c4cd2e9ab9c1ca0ddb52c0  ./ipfire-3.x/.git/logs/HEAD
-376eb5d008c4cd2e9ab9c1ca0ddb52c0  ./ipfire-3.x/.git/logs/refs/heads/master
-376eb5d008c4cd2e9ab9c1ca0ddb52c0  ./ipfire-3.x/.git/logs/refs/remotes/origin/HEAD
-c2c9ee9d2a6e47102d3b6985de3e8f14  ./ipfire-3.x/.git/objects/pack/pack-1055d3b3caa65442e1171b12cf9d293ab51922f3.idx
-ab4113811a0c0d018cc4d215c4232bdc  ./ipfire-3.x/.git/objects/pack/pack-1055d3b3caa65442e1171b12cf9d293ab51922f3.pack
-5d1ac344f7a618262bd1d96eab2f38cc  ./ipfire-3.x/.git/packed-refs
-a6eda3b57520bea6bbf82aaa55ab0f2d  ./ipfire-3.x/.git/refs/heads/master
-73a00957034783b7b5c8294c54cd3e12  ./ipfire-3.x/.git/refs/remotes/origin/HEAD
-a6eda3b57520bea6bbf82aaa55ab0f2d  ./ipfire-3.x/.git/shallow
-d58a063b67e593e8747705fe5c8b1da9  ./ipfire-3.x/.mailmap
+716c22dd7497d1b40822a74c70c4e2e0  ./dhclient-script.PATH.diff.gz
+bbdd080496faf8868ec5927f2b322dd9  ./dhcommon-getifaddrs.patch
+2b5e5b2fa31c2e27e487039d86f83d3f  ./dhcp-4.3.5.tar.gz
+3c2d582bcf2c977b31209232fd8abbe8  ./dhcp_dev.pkg
+7322ca30f1a0ceb09fd1507c76c1668e  ./dhcp.pkg
+8f16c693d62a9aab9d92d50746c8f80b  ./dhcp-remove-bind-tarball.sh
+9612f32ecb1224da4a2ab04c36f92af1  ./dhcp.SlackBuild
+913ad6afd019462a13f227b361f8ba42  ./dhcp.SlackBuild.log.gz
+b24a314f6c369739a186482cc76a0b92  ./dhcp.SlackBuild.orig
+4ada88a7b59f183cd8a52ab0b1fbc850  ./doinst.sh.gz
+d99129788515aa0303747198c141dfb4  ./isc-dhcp_4.3.5-3.debian.tar.xz
 bc2a1645a1d85bd372a61eb274b9408a  ./post.dhcp
 4fed5a24da160374c56217077f894784  ./slack-desc

npl/internetserver/dhcp/dhcp.version

@@ -1 @@
-4.2.5
+4.3.5