bind 9.11.5-P1
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 Mar 2019 15:10:13 +0000 (11:10 -0400)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 Mar 2019 15:10:13 +0000 (11:10 -0400)
.gitmodules [new file with mode: 0644]
9.11.2-libtool.patch
bind.cygport
fedora [new submodule]

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..8ee8730
--- /dev/null
@@ -0,0 +1,3 @@
+[submodule "fedora"]
+       path = fedora
+       url = https://src.fedoraproject.org/rpms/bind.git
index 497996388fb265361389ac4d037a0dd3924df7d3..946d3193ed594ebf7f6d941c151a532c78bc0f33 100644 (file)
                ${OBJS} version.@O@ ${LIBS}
  
  timestamp: liblwres.@A@
---- origsrc/bind-9.11.2/lib/tests/Makefile.in  2017-07-24 00:36:50.000000000 -0500
-+++ src/bind-9.11.2/lib/tests/Makefile.in      2018-01-09 18:53:35.928249000 -0600
-@@ -38,6 +38,7 @@ libt_api.@SA@: ${OBJS}
- libt_api.la: ${OBJS}
-       ${LIBTOOL_MODE_LINK} \
-               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libt_api.la -rpath ${libdir} \
-+              -no-undefined -static \
-               ${OBJS} ${ISCLIBS} ${LIBS} @LIBTOOL_ALLOW_UNDEFINED@ @LIBTOOL_IN_MAIN@
- timestamp: libt_api.@A@
index a73013ad88b209d9767c986928a4d6ce77f7ed9e..1207f1944b5e64496591e10ef7e5946683c854c5 100644 (file)
@@ -1,8 +1,8 @@
-inherit python2 python3
+inherit python3 python-wheel
 
 NAME="bind"
-VERSION=9.11.2
-RELEASE=2.P1
+VERSION=9.11.5
+RELEASE=1.P1
 CATEGORY="Net"
 SUMMARY="DNS server and utilities suite"
 DESCRIPTION="BIND is an implementation of the Domain Name System (DNS)
@@ -11,7 +11,7 @@ They specify the process by which one computer can find another computer
 on the basis of its name. The BIND software distribution contains all of
 the software needed both to ask name service questions and to answer
 such questions."
-HOMEPAGE="http://www.isc.org/software/bind/"
+HOMEPAGE="http://www.isc.org/downloads/bind/"
 #tar_v=${VERSION}
 tar_v="${VERSION}-${RELEASE##*\.}"
 SRC_URI="http://ftp.isc.org/isc/bind9/${tar_v}/bind-${tar_v}.tar.gz
@@ -19,21 +19,37 @@ SRC_URI="http://ftp.isc.org/isc/bind9/${tar_v}/bind-${tar_v}.tar.gz
          named-config"
 SRC_DIR="bind-${tar_v}"
 PATCH_URI="
-       http://pkgs.fedoraproject.org/cgit/rpms/bind.git/plain/bind-99-libidn.patch
-       http://pkgs.fedoraproject.org/cgit/rpms/bind.git/plain/bind-9.11-rh1410433.patch
-       http://pkgs.fedoraproject.org/cgit/rpms/bind.git/plain/bind-9.11-rh1205168.patch
+       fedora/bind-95-rh452060.patch
+       fedora/bind93-rh490837.patch
+       fedora/bind97-rh478718.patch
+       fedora/bind97-rh645544.patch
+       fedora/bind99-rh640538.patch
+       fedora/bind97-rh669163.patch
+       fedora/bind-9.11-rh1410433.patch
+       fedora/bind-9.11-rh1205168.patch
+       fedora/bind-9.11-oot-manual.patch
+       fedora/bind-9.11-rt31459.patch
+       fedora/bind-9.11-rt46047.patch
+       fedora/bind-9.11-rh1624100.patch
+       fedora/bind-9.11-host-idn-disable.patch
+       fedora/bind-9.11-unit-dnstap-pkcs11.patch
+       fedora/bind-9.11-rh1663318.patch
+       fedora/bind-9.11-rh1666814.patch
+       fedora/bind-9.11-rh1647829.patch
+       fedora/bind-9.11-rh1647829-2.patch
        9.9.6-configure.patch
        9.9.6-lwconfig-win32.patch
        9.5.0-parallel-build.patch
        9.9.6-cygwin-threads.patch
        9.10.3-cygwin-ftm.patch
+       9.10.4-doc-vpath.patch
        9.11.2-libtool.patch
 "
 
 PKG_NAMES="bind bind-utils bind-doc
-          libbind9_160 libdns169 libirs160 libisc166 libisccc160
-          libisccfg160 liblwres160 libbind9-devel
-          python2-isc python3-isc"
+          libbind9_161 libdns1104 libirs161 libisc1100 libisccc161
+          libisccfg163 liblwres161 libbind9-devel
+          python27-isc python36-isc"
 bind_SUMMARY="DNS server"
 bind_REQUIRES="bind-utils"
 bind_CONTENTS="
@@ -56,27 +72,27 @@ bind_utils_CONTENTS="
 bind_doc_CATEGORY="Doc"
 bind_doc_SUMMARY="BIND Administrator Reference Manual"
 bind_doc_CONTENTS="usr/share/doc/bind/arm/"
-libbind9_160_CATEGORY="Libs"
-libbind9_160_SUMMARY="BIND library"
-libbind9_160_CONTENTS="usr/bin/cygbind9-160.dll"
-libdns169_CATEGORY="Libs"
-libdns169_SUMMARY="BIND DNS library"
-libdns169_CONTENTS="usr/bin/cygdns-169.dll"
-libirs160_CATEGORY="Libs"
-libirs160_SUMMARY="BIND resolv.conf parser library"
-libirs160_CONTENTS="usr/bin/cygirs-160.dll"
-libisc166_CATEGORY="Libs"
-libisc166_SUMMARY="BIND ISC core library"
-libisc166_CONTENTS="usr/bin/cygisc-166.dll"
-libisccc160_CATEGORY="Libs"
-libisccc160_SUMMARY="BIND Control Channel library"
-libisccc160_CONTENTS="usr/bin/cygisccc-160.dll"
-libisccfg160_CATEGORY="Libs"
-libisccfg160_SUMMARY="BIND named.conf parser library"
-libisccfg160_CONTENTS="usr/bin/cygisccfg-160.dll"
-liblwres160_CATEGORY="Libs"
-liblwres160_SUMMARY="BIND Lightweight Resolver library"
-liblwres160_CONTENTS="usr/bin/cyglwres-160.dll"
+libbind9_161_CATEGORY="Libs"
+libbind9_161_SUMMARY="BIND library"
+libbind9_161_CONTENTS="usr/bin/cygbind9-161.dll"
+libdns1104_CATEGORY="Libs"
+libdns1104_SUMMARY="BIND DNS library"
+libdns1104_CONTENTS="usr/bin/cygdns-1104.dll"
+libirs161_CATEGORY="Libs"
+libirs161_SUMMARY="BIND resolv.conf parser library"
+libirs161_CONTENTS="usr/bin/cygirs-161.dll"
+libisc1100_CATEGORY="Libs"
+libisc1100_SUMMARY="BIND ISC core library"
+libisc1100_CONTENTS="usr/bin/cygisc-1100.dll"
+libisccc161_CATEGORY="Libs"
+libisccc161_SUMMARY="BIND Control Channel library"
+libisccc161_CONTENTS="usr/bin/cygisccc-161.dll"
+libisccfg163_CATEGORY="Libs"
+libisccfg163_SUMMARY="BIND named.conf parser library"
+libisccfg163_CONTENTS="usr/bin/cygisccfg-163.dll"
+liblwres161_CATEGORY="Libs"
+liblwres161_SUMMARY="BIND Lightweight Resolver library"
+liblwres161_CONTENTS="usr/bin/cyglwres-161.dll"
 libbind9_devel_CATEGORY="Libs"
 libbind9_devel_REQUIRES="libGeoIP-devel libjson-c-devel libkrb5-devel libxml2-devel openssl-devel"
 libbind9_devel_SUMMARY="BIND libraries (development)"
@@ -95,20 +111,22 @@ libbind9_devel_CONTENTS="
        usr/share/man/man1/isc-config.sh*
        usr/share/man/man3/
 "
-python2_isc_CATEGORY="Python"
-python2_isc_OBSOLETES="python-isc"
-python2_isc_SUMMARY="Python module for sending commands to rndc"
-python2_isc_CONTENTS="${PYTHON2_SITELIB#/}/isc*"
-python3_isc_CATEGORY="Python"
-python3_isc_SUMMARY="Python module for sending commands to rndc"
-python3_isc_CONTENTS="${PYTHON3_SITELIB#/}/isc*"
+python27_isc_CATEGORY="Python"
+python27_isc_OBSOLETES="python-isc python2-isc"
+python27_isc_SUMMARY="Python module for sending commands to rndc"
+python27_isc_CONTENTS="usr/lib/python2.7/site-packages/isc*"
+python36_isc_CATEGORY="Python"
+python36_isc_OBSOLETES="python3-isc"
+python36_isc_SUMMARY="Python module for sending commands to rndc"
+python36_isc_CONTENTS="usr/lib/python3.6/site-packages/isc*"
 
-DIFF_EXCLUDES="*.1 *.html *.pdf"
+DIFF_EXCLUDES="*.1 *.8 *.html *.pdf notes.txt"
 DISTCLEANFILES="aclocal.m4"
 
 src_compile() {
        cd ${S}
        cygautoreconf
+       lndirs
 
        cd ${B}
 
@@ -141,23 +159,30 @@ _EOF
                --with-docbook-xsl=/usr/share/sgml/docbook/xsl-stylesheets \
                --with-geoip \
                --with-gssapi --disable-isc-spnego \
+               --with-libidn2 \
+               --with-libjson \
                --with-libtool \
                --with-libxml2=/usr \
-               --with-openssl=/usr
+               --with-lmdb \
+               --with-openssl=/usr \
+               --with-python=${PYTHON3}
 
        cygmake
+       cygmake -j1 doc
 
-#      lndirs
-#      cygmake -j1 doc
+       pushd ${B}/bin/python
+       python_wheel_compile
+       popd
 }
 
 src_install() {
        cd ${B}
        dosbin ${S}/named-config
-       cyginstall
+       cyginstall -j1
 
+       find ${D}${PYTHON3_SITELIB}/isc* -delete
        pushd ${B}/bin/python
-       ${PYTHON3} ${S}/bin/python/setup.py install --no-compile --root=${D}
+       python_wheel_install
        popd
 
        sed -i -e "s|-Wl,${B}[^ ]*||" ${D}/usr/bin/isc-config.sh
diff --git a/fedora b/fedora
new file mode 160000 (submodule)
index 0000000..6fee3d6
--- /dev/null
+++ b/fedora
@@ -0,0 +1 @@
+Subproject commit 6fee3d63e97cc86062b9fedb5d9294455cf522b6
This page took 0.027555 seconds and 5 git commands to generate.