Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
# $NetBSD: Makefile,v 1.12 2013/05/10 00:58:06 riastradh Exp $
|
||||
#
|
||||
# $NetBSD: Makefile,v 1.14 2014/02/12 23:18:21 tron Exp $
|
||||
|
||||
PKGNAME= isc-dhcp-${DHVER}
|
||||
PKGREVISION= 2
|
||||
PKGREVISION= 1
|
||||
COMMENT= ISC Dynamic Host Configuration Protocol (DHCP) Base
|
||||
BUILD_SUBDIR= bind includes tests common # dst
|
||||
SUBDIR= includes common # dst
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.common,v 1.21 2013/05/10 00:58:06 riastradh Exp $
|
||||
# $NetBSD: Makefile.common,v 1.22 2014/02/09 04:34:31 taca Exp $
|
||||
#
|
||||
# used by net/isc-dhcp4/Makefile
|
||||
# used by net/isc-dhcpd4/Makefile
|
||||
@@ -17,7 +17,7 @@ LICENSE= isc
|
||||
|
||||
CONFLICTS+= isc-dhcp-base-3.*{,nb*}
|
||||
|
||||
VERSION= 4.2.5-P1
|
||||
VERSION= 4.3.0
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
@@ -81,7 +81,7 @@ BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include
|
||||
BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib
|
||||
BIND_CONFIGURE_ARGS+= --with-gssapi=no
|
||||
|
||||
BIND_WRKSRC= ${WRKSRC}/bind/bind-9.8.4-P2
|
||||
BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.5
|
||||
|
||||
post-configure:
|
||||
${RUN}${_ULIMIT_CMD} \
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
$NetBSD: distinfo,v 1.17 2013/05/10 00:58:06 riastradh Exp $
|
||||
$NetBSD: distinfo,v 1.18 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
SHA1 (dhcp-4.2.5-P1.tar.gz) = 120b6e476b2ac0d35e1dc8dee53752c42449b925
|
||||
RMD160 (dhcp-4.2.5-P1.tar.gz) = 8633cea4a2e5a1900c8a6dac3ebcbd6ff53c2fa9
|
||||
Size (dhcp-4.2.5-P1.tar.gz) = 8255960 bytes
|
||||
SHA1 (patch-aa) = cdb64616f16ee79bf14f496518a2958352ce1fc9
|
||||
SHA1 (patch-ab) = 3a36eb65c6b0a865f2d8a350fa083fa2fe549efd
|
||||
SHA1 (patch-ac) = 97af5dd9e787c63ca387fb05df20f42d90b985fb
|
||||
SHA1 (patch-bind_bind-9.8.4-P2_lib_export_dns_Makefile.in) = 4369cced9a567eed16617459daa5ddaa1ffecb23
|
||||
SHA1 (patch-common_dlpi.c) = e58c1b8d7a6badc62e59677e093c4d01f75b9379
|
||||
SHA1 (patch-includes_Makefile.in) = 6004f66e28cd53c0acd09746a284eefe70a3aef2
|
||||
SHA1 (dhcp-4.3.0.tar.gz) = deed72a4636461042b74de68c2825dc52623e1d1
|
||||
RMD160 (dhcp-4.3.0.tar.gz) = 915e94fb080a6726f4d8357e249aad7104e2fd1a
|
||||
Size (dhcp-4.3.0.tar.gz) = 8960567 bytes
|
||||
SHA1 (patch-aa) = 27afe063248db97c3022d726f4e1653e83aeedff
|
||||
SHA1 (patch-ab) = c87ae71fdd70137a97f918d3240a1025a4dbe0cc
|
||||
SHA1 (patch-ac) = 440cd2d3db555fb7f4a433f218e2c9aa6bcf390c
|
||||
SHA1 (patch-bind_bind-9.9.5_configure) = 645603865146fe43b5f0ea109d8dbe590611f124
|
||||
SHA1 (patch-bind_bind-9.9.5_lib_export_dns_Makefile.in) = 2cb8fd2a90b577376b0f9512545b82724acb0e1d
|
||||
SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc
|
||||
SHA1 (patch-includes_Makefile.in) = 8b40bd1bf1e828fb99250450fc1b887580fc9233
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
$NetBSD: patch-aa,v 1.4 2011/04/08 14:09:24 taca Exp $
|
||||
$NetBSD: patch-aa,v 1.5 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
* Don't install config files.
|
||||
|
||||
--- server/Makefile.in.orig 2011-03-24 21:58:37.000000000 +0000
|
||||
--- server/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000
|
||||
+++ server/Makefile.in
|
||||
@@ -615,13 +615,6 @@ uninstall-man8:
|
||||
done
|
||||
@@ -808,19 +808,6 @@ uninstall-man8:
|
||||
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
|
||||
install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
|
||||
- if test -n "$$list"; then \
|
||||
- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
|
||||
- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
|
||||
- fi; \
|
||||
- for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- echo "$$d$$p"; \
|
||||
- done | $(am__base_list) | \
|
||||
- while read files; do \
|
||||
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
|
||||
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
|
||||
- done
|
||||
|
||||
uninstall-dist_sysconfDATA:
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
$NetBSD: patch-ab,v 1.4 2011/04/08 14:09:24 taca Exp $
|
||||
$NetBSD: patch-ab,v 1.5 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
* Don't install config files.
|
||||
|
||||
--- client/Makefile.in.orig 2011-03-24 21:58:36.000000000 +0000
|
||||
--- client/Makefile.in.orig 2014-01-31 19:20:49.000000000 +0000
|
||||
+++ client/Makefile.in
|
||||
@@ -351,13 +351,6 @@ uninstall-man8:
|
||||
done
|
||||
@@ -492,19 +492,6 @@ uninstall-man8:
|
||||
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
|
||||
install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
|
||||
- if test -n "$$list"; then \
|
||||
- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
|
||||
- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
|
||||
- fi; \
|
||||
- for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- echo "$$d$$p"; \
|
||||
- done | $(am__base_list) | \
|
||||
- while read files; do \
|
||||
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
|
||||
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
|
||||
- done
|
||||
|
||||
uninstall-dist_sysconfDATA:
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-ac,v 1.2 2011/04/08 14:09:24 taca Exp $
|
||||
$NetBSD: patch-ac,v 1.3 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
* Honor PKG_SYSCONFDIR and PREFIX.
|
||||
|
||||
--- includes/dhcpd.h.orig 2010-12-03 20:32:14.000000000 +0000
|
||||
--- includes/dhcpd.h.orig 2014-01-31 19:20:49.000000000 +0000
|
||||
+++ includes/dhcpd.h
|
||||
@@ -1386,7 +1386,7 @@ typedef unsigned char option_mask [16];
|
||||
@@ -1419,7 +1419,7 @@ typedef unsigned char option_mask [16];
|
||||
#else /* !DEBUG */
|
||||
|
||||
#ifndef _PATH_DHCPD_CONF
|
||||
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 2011/04/08 14:09:24 taca Exp $
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef _PATH_DHCPD_DB
|
||||
@@ -1408,11 +1408,11 @@ typedef unsigned char option_mask [16];
|
||||
@@ -1441,11 +1441,11 @@ typedef unsigned char option_mask [16];
|
||||
#endif /* DEBUG */
|
||||
|
||||
#ifndef _PATH_DHCLIENT_CONF
|
||||
|
||||
15
net/isc-dhcp4/patches/patch-bind_bind-9.9.5_configure
Normal file
15
net/isc-dhcp4/patches/patch-bind_bind-9.9.5_configure
Normal file
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-bind_bind-9.9.5_configure,v 1.1 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
* Avoid using "==" for argument of test(1).
|
||||
|
||||
--- bind/bind-9.9.5/configure.orig 2014-01-27 18:58:24.000000000 +0000
|
||||
+++ bind/bind-9.9.5/configure
|
||||
@@ -11685,7 +11685,7 @@ done
|
||||
|
||||
;;
|
||||
esac
|
||||
- if test "X$PYTHON" == "X"
|
||||
+ if test "X$PYTHON" = "X"
|
||||
then
|
||||
case "$use_python" in
|
||||
unspec)
|
||||
@@ -1,11 +1,11 @@
|
||||
$NetBSD: patch-bind_bind-9.8.4-P2_lib_export_dns_Makefile.in,v 1.1 2013/05/10 00:58:06 riastradh Exp $
|
||||
$NetBSD: patch-bind_bind-9.9.5_lib_export_dns_Makefile.in,v 1.1 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
Build gen with BUILD_CC and the associated BUILD_* flags so it can run
|
||||
on the build platform when cross-compiling.
|
||||
|
||||
--- bind/bind-9.8.4-P2/lib/export/dns/Makefile.in.orig 2012-10-26 04:52:55.000000000 +0000
|
||||
+++ bind/bind-9.8.4-P2/lib/export/dns/Makefile.in
|
||||
@@ -166,7 +166,8 @@ code.h: gen
|
||||
--- bind/bind-9.9.5/lib/export/dns/Makefile.in.orig 2014-01-27 18:58:24.000000000 +0000
|
||||
+++ bind/bind-9.9.5/lib/export/dns/Makefile.in
|
||||
@@ -168,7 +168,8 @@ code.h: gen
|
||||
./gen -s ${srcdir} > code.h
|
||||
|
||||
gen: ${srcdir}/gen.c
|
||||
@@ -1,8 +1,8 @@
|
||||
$NetBSD: patch-common_dlpi.c,v 1.1 2013/04/10 11:31:27 fhajny Exp $
|
||||
$NetBSD: patch-common_dlpi.c,v 1.2 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
Add support for Crossbow style NICs (SunOS).
|
||||
|
||||
--- common/dlpi.c.orig 2013-01-03 00:02:24.000000000 +0000
|
||||
--- common/dlpi.c.orig 2014-01-31 19:19:59.000000000 +0000
|
||||
+++ common/dlpi.c
|
||||
@@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in
|
||||
#define DLPI_MAXDLBUF 8192 /* Buffer size */
|
||||
@@ -12,7 +12,7 @@ Add support for Crossbow style NICs (SunOS).
|
||||
|
||||
static int dlpiopen(const char *ifname);
|
||||
static int dlpiunit (char *ifname);
|
||||
@@ -775,14 +776,26 @@ static int dlpiunit (ifname)
|
||||
@@ -773,14 +774,26 @@ static int dlpiunit (ifname)
|
||||
*/
|
||||
static int
|
||||
dlpiopen(const char *ifname) {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-includes_Makefile.in,v 1.2 2012/07/25 00:56:53 taca Exp $
|
||||
$NetBSD: patch-includes_Makefile.in,v 1.3 2014/02/09 04:34:31 taca Exp $
|
||||
|
||||
Don't need isc-dhcp/dst.h.
|
||||
|
||||
--- includes/Makefile.in.orig 2012-07-13 06:17:54.000000000 +0000
|
||||
--- includes/Makefile.in.orig 2014-01-31 19:19:59.000000000 +0000
|
||||
+++ includes/Makefile.in
|
||||
@@ -147,8 +147,7 @@ top_builddir = @top_builddir@
|
||||
@@ -262,8 +262,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
|
||||
omapip/hash.h omapip/isclib.h omapip/omapip.h \
|
||||
|
||||
Reference in New Issue
Block a user