From f87d2f43be04825e62c2e2a07e51b312d8688a59 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 25 May 2016 15:52:43 +0200 Subject: [PATCH] Remove static package scripts and mentions --- build-scripts/build-auth-semistatic | 133 ------------------ .../.gitignore | 5 - .../debian-authoritative-semistatic/control | 30 ---- .../debian-authoritative-semistatic/copyright | 25 ---- .../debian-authoritative-semistatic/doc-base | 12 -- .../pdns.conffiles | 2 - .../pdns.postinst | 28 ---- .../pdns.postrm | 22 --- .../pdns.prerm | 26 ---- .../debian-authoritative-semistatic/rules | 114 --------------- .../shlibs.local | 1 - build-scripts/rpm-build-instruction | 20 --- build-scripts/semistaticg++ | 19 --- docs/markdown/appendix/compiling-powerdns.md | 4 +- docs/markdown/authoritative/installation.md | 7 - docs/markdown/httpapi/README.md | 7 - 16 files changed, 1 insertion(+), 454 deletions(-) delete mode 100755 build-scripts/build-auth-semistatic delete mode 100644 build-scripts/debian-authoritative-semistatic/.gitignore delete mode 100644 build-scripts/debian-authoritative-semistatic/control delete mode 100644 build-scripts/debian-authoritative-semistatic/copyright delete mode 100644 build-scripts/debian-authoritative-semistatic/doc-base delete mode 100644 build-scripts/debian-authoritative-semistatic/pdns.conffiles delete mode 100755 build-scripts/debian-authoritative-semistatic/pdns.postinst delete mode 100755 build-scripts/debian-authoritative-semistatic/pdns.postrm delete mode 100755 build-scripts/debian-authoritative-semistatic/pdns.prerm delete mode 100755 build-scripts/debian-authoritative-semistatic/rules delete mode 100644 build-scripts/debian-authoritative-semistatic/shlibs.local delete mode 100755 build-scripts/rpm-build-instruction delete mode 100755 build-scripts/semistaticg++ diff --git a/build-scripts/build-auth-semistatic b/build-scripts/build-auth-semistatic deleted file mode 100755 index cb07214d2..000000000 --- a/build-scripts/build-auth-semistatic +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh - -if [ "$0" != "./build-scripts/build-auth-semistatic" ]; then - echo "Please run me from the root checkout dir" - exit 1 -fi - -if [ -z "$VERSION" ]; then - echo 'Please set $VERSION' >&2 - exit 1 -fi - -if [ -z "$RELEASE" ];then - echo 'Please set $RELEASE' >&2 - exit 1 -fi - -if [ -z "$DISTDIR" ]; then - DISTDIR=pdns -fi - -set -e -set -x - -rm -rf $DISTDIR/debian/ -cp -r build-scripts/debian-authoritative-semistatic $DISTDIR/debian - -cd $DISTDIR - -cat > debian/changelog << EOF -pdns (${VERSION}-${RELEASE}) unstable; urgency=medium - - * Automatic build - - -- PowerDNS.COM AutoBuilder $(date -R) - -EOF - -fakeroot debian/rules binary-static - -cat > pdns.spec <= 1.10.17), libboost-dev (>=1.34), libboost-program-options-dev, libboost-serialization-dev, pkg-config, ragel, libbotan1.10-dev, liblua5.1-dev, libyaml-cpp-dev (>= 0.5). libgeoip-dev - -Package: pdns-static -Architecture: any -Conflicts: pdns-server -Description: PowerDNS nameserver (static version) - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - . - This package contains a statically compiled version of PowerDNS which - can be used on older Debian releases for which no dynamic version - is available. - -Package: pdns-tools -Architecture: any -Conflicts: pdns-server -Description: PowerDNS tools (static version) - PowerDNS is a versatile nameserver which supports a large number - of different backends ranging from simple zonefiles to relational - databases and load balancing/failover algorithms. - . - This package contains a collection of tools based on the core - PowerDNS libraries. diff --git a/build-scripts/debian-authoritative-semistatic/copyright b/build-scripts/debian-authoritative-semistatic/copyright deleted file mode 100644 index 8c1b1cf72..000000000 --- a/build-scripts/debian-authoritative-semistatic/copyright +++ /dev/null @@ -1,25 +0,0 @@ -This is the prepackaged version of the PowerDNS -nameserver. - -PowerDNS can be downloaded from http://www.powerdns.com/ - -Copyright and license: - - Copyright 2002 PowerDNS.COM BV - - This program is free software; you can redistribute it and/or modify - it under the terms of version 2 of the GNU General Public License as - published by the Free Software Foundation. - - Additionally, the license of this program contains a special - exception which allows to distribute the program in binary form when - it is linked against OpenSSL. - - 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. - -On Debian systems, the complete text of the GNU General Public License -can be found in /usr/share/common-licenses/GPL - diff --git a/build-scripts/debian-authoritative-semistatic/doc-base b/build-scripts/debian-authoritative-semistatic/doc-base deleted file mode 100644 index 5f95c49c3..000000000 --- a/build-scripts/debian-authoritative-semistatic/doc-base +++ /dev/null @@ -1,12 +0,0 @@ -Document: pdns -Title: PowerDNS manual -Author: PowerDNS B.V. -Section: Apps/System -Abstract: PowerDNS manual - This is the complete manual for PowerDNS, documenting both - how to install and configure it as well as how to write - new backend modules. - -Format: html -Index: /usr/share/doc/pdns/html/index.html -Files: /usr/share/doc/pdns/html/*.html diff --git a/build-scripts/debian-authoritative-semistatic/pdns.conffiles b/build-scripts/debian-authoritative-semistatic/pdns.conffiles deleted file mode 100644 index 52ba0562b..000000000 --- a/build-scripts/debian-authoritative-semistatic/pdns.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/powerdns/pdns.conf -/etc/init.d/pdns diff --git a/build-scripts/debian-authoritative-semistatic/pdns.postinst b/build-scripts/debian-authoritative-semistatic/pdns.postinst deleted file mode 100755 index 0c66191c6..000000000 --- a/build-scripts/debian-authoritative-semistatic/pdns.postinst +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# postinst script for pdns - -set -e - -case "$1" in - configure) - if [ -z $2 ]; then - update-rc.d pdns defaults 15 85 > /dev/null - invoke-rc.d pdns start - else - invoke-rc.d pdns status > /dev/null - [ $? -eq 3 ] || invoke-rc.d pdns restart - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/build-scripts/debian-authoritative-semistatic/pdns.postrm b/build-scripts/debian-authoritative-semistatic/pdns.postrm deleted file mode 100755 index e16b8acdf..000000000 --- a/build-scripts/debian-authoritative-semistatic/pdns.postrm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# postrm script for pdns - -set -e - -case "$1" in - purge|remove) - update-rc.d pdns remove - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/build-scripts/debian-authoritative-semistatic/pdns.prerm b/build-scripts/debian-authoritative-semistatic/pdns.prerm deleted file mode 100755 index 5a312c733..000000000 --- a/build-scripts/debian-authoritative-semistatic/pdns.prerm +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# prerm script for pdns - -set -e - -case "$1" in - remove|upgrade|deconfigure) - if command -v invoke-rc.d >/dev/null 2>&1; then - invoke-rc.d pdns stop - else - /etc/init.d/pdns stop - fi - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/build-scripts/debian-authoritative-semistatic/rules b/build-scripts/debian-authoritative-semistatic/rules deleted file mode 100755 index a33b813e0..000000000 --- a/build-scripts/debian-authoritative-semistatic/rules +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/make -f -# This rules file is usable only for PowerDNS.COM static builds. -# If you want a Debian-downstream-style package, please use the packaging from Debian. - -tmpdir := $(shell pwd)/debian/tmp -tools_tmpdir := $(shell pwd)/debian/tmp-tools - -build-static stamp-build-static: - ./configure \ - CXX=$(shell pwd)/build-scripts/semistaticg++ \ - PKG_CONFIG_PATH=/opt/botan-1.10/lib/pkgconfig/ \ - --prefix=/usr \ - --libexecdir='$${prefix}/lib' \ - --libdir='$${prefix}/lib' \ - --sysconfdir=/etc/powerdns \ - --infodir='$${datadir}/info' \ - --mandir='$${datadir}/man' \ - --with-pgsql-lib=/opt/postgresql/lib --with-pgsql-includes=/opt/postgresql/include \ - --with-modules="bind gmysql gpgsql pipe gsqlite3 lua geoip tinydns mydns opendbx remote random" \ - --with-dynmodules="" \ - --enable-botan1.10 \ - --enable-static-binaries \ - --enable-tools - make -j4 - touch stamp-build-static - - -binary-main-prepare: - rm -f debian/substvars - rm -rf "$(tmpdir)" "$(tmpdir)"-* - rm -rf "$(tools_tmpdir)" "$(tools_tmpdir)"-* - install -d -m 755 -o root -g root "$(tmpdir)" - install -d -m 755 -o root -g root "$(tools_tmpdir)" - make DESTDIR="$(tmpdir)" install - - rm -f "$(tmpdir)"/usr/bin/binpatch - rm -f "$(tmpdir)"/usr/bin/zone2ldap - rm -rf "$(tmpdir)"/usr/lib - rm -f "$(tmpdir)"/usr/share/man/man1/zone2ldap.1 - strip --remove-section=.comment --remove-section=.note \ - --strip-unneeded \ - "$(tmpdir)"/usr/bin/zone2sql \ - "$(tmpdir)"/usr/sbin/pdns_server \ - "$(tmpdir)"/usr/bin/pdns_control - mv "$(tmpdir)"/etc/powerdns/pdns.conf-dist "$(tmpdir)"/etc/powerdns/pdns.conf - - install -d -m 755 -o root -g root "$(tmpdir)"/etc/init.d - install -p -m 755 -o root -g root pdns/pdns.init \ - "$(tmpdir)"/etc/init.d/pdns - - install -d -m 755 -o root -g root \ - "$(tmpdir)"/usr/share/doc/pdns - install -p -m 644 -o root -g root debian/changelog \ - "$(tmpdir)"/usr/share/doc/pdns/changelog.Debian - gzip -9 "$(tmpdir)"/usr/share/doc/pdns/c* - install -p -m 644 -o root -g root debian/copyright \ - "$(tmpdir)"/usr/share/doc/pdns/ - - install -d -m 755 -o root -g root "$(tmpdir)"/DEBIAN - install -p -m 755 -o root -g root debian/pdns.prerm \ - "$(tmpdir)"/DEBIAN/prerm - install -p -m 755 -o root -g root debian/pdns.postrm \ - "$(tmpdir)"/DEBIAN/postrm - install -p -m 755 -o root -g root debian/pdns.postinst \ - "$(tmpdir)"/DEBIAN/postinst - install -p -m 644 -o root -g root debian/pdns.conffiles \ - "$(tmpdir)"/DEBIAN/conffiles - - - install -d -m 755 -o root -g root \ - "$(tools_tmpdir)"/usr/bin - install -d -m 755 -o root -g root \ - "$(tools_tmpdir)"/usr/share/man/man8 - install -d -m 755 -o root -g root \ - "$(tools_tmpdir)"/usr/share/man/man1 - install -d -m 755 -o root -g root \ - "$(tools_tmpdir)"/usr/share/doc/pdns-tools - install -p -m 644 -o root -g root debian/changelog \ - "$(tools_tmpdir)"/usr/share/doc/pdns-tools/changelog.Debian - gzip -9 "$(tools_tmpdir)"/usr/share/doc/pdns-tools/c* - install -p -m 644 -o root -g root debian/copyright \ - "$(tools_tmpdir)"/usr/share/doc/pdns-tools/ - - install -d -m 755 -o root -g root "$(tools_tmpdir)"/DEBIAN - - #FIXME: shell loops hide errors - for prog in dnsbulktest dnsgram dnsreplay dnsscan dnsscope dnstcpbench dnswasher \ - ixplore notify nproxy nsec3dig saxfr sdig ; do \ - mv "$(tmpdir)"/usr/bin/$$prog "$(tools_tmpdir)"/usr/bin ; \ - [ -e "$(tmpdir)"/usr/share/man/man8/"$$prog".8 ] && \ - mv "$(tmpdir)"/usr/share/man/man8/"$$prog".8 "$(tools_tmpdir)"/usr/share/man/man8/ ; \ - [ -e "$(tmpdir)"/usr/share/man/man1/"$$prog".1 ] && \ - mv "$(tmpdir)"/usr/share/man/man1/"$$prog".1 "$(tools_tmpdir)"/usr/share/man/man1/ ; \ - strip --remove-section=.comment --remove-section=.note \ - --strip-unneeded \ - "$(tools_tmpdir)"/usr/bin/"$$prog" ; \ - done - - -binary-static: stamp-build-static binary-main-prepare - dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns-static -P"$(tmpdir)" - dpkg-gencontrol -fdebian/files -cdebian/control -ldebian/changelog -isp -ppdns-tools -P"$(tools_tmpdir)" - dpkg --build "$(tmpdir)" .. - dpkg --build "$(tools_tmpdir)" .. - - -clean: - -make distclean - -make -C docs clean - rm -f debian/files debian/substvars stamp-build stamp-build-static - rm -rf "$(tmpdir)" - -.PHONY: clean - diff --git a/build-scripts/debian-authoritative-semistatic/shlibs.local b/build-scripts/debian-authoritative-semistatic/shlibs.local deleted file mode 100644 index a2ae88ae1..000000000 --- a/build-scripts/debian-authoritative-semistatic/shlibs.local +++ /dev/null @@ -1 +0,0 @@ -libbindbackend 0 diff --git a/build-scripts/rpm-build-instruction b/build-scripts/rpm-build-instruction deleted file mode 100755 index de23d9ea6..000000000 --- a/build-scripts/rpm-build-instruction +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -#LIBS="-lkrb5 -lk5crypto -lpgport -lgssapi_krb5 -lkrb5support -lgssapi_krb5 -lcom_err -lnsl -lresolv" \ -CC="ccache gcc" CXX="ccache g++" CPPFLAGS=-I/usr/local/include/botan-1.10 ./configure \ - --with-modules="bind gmysql gpgsql gsqlite3 pipe geo lua random" \ - --with-dynmodules="" \ - --enable-static-binaries \ - --with-pgsql-lib=/opt/postgresql/lib --with-pgsql-includes=/opt/postgresql/include \ - --prefix=/usr \ - --sysconfdir=/etc/powerdns --enable-botan1.10 \ - --mandir=/usr/man/ \ -&& make clean && make -j4 && \ -fakeroot /bin/sh -c "rm -rf /tmp/pdns ; DESTDIR=/tmp/pdns make install-strip" && -fakeroot rm -f /tmp/pdns/usr/lib/pdns/*.a /tmp/pdns/usr/lib/pdns/*.la && -fakeroot install -d -m 755 -o root -g root /tmp/pdns/etc/init.d && -fakeroot install -p -m 755 -o root -g root pdns/pdns.init /tmp/pdns/etc/init.d/pdns && -fakeroot mkdir -p /tmp/pdns/etc/powerdns && -fakeroot mv /tmp/pdns/etc/powerdns/pdns.conf-dist /tmp/pdns/etc/powerdns/pdns.conf && -fakeroot rm /tmp/pdns/usr/bin/zone2ldap && -fakeroot rpmbuild -bb pdns.spec --buildroot /tmp/pdns - diff --git a/build-scripts/semistaticg++ b/build-scripts/semistaticg++ deleted file mode 100755 index 0e14e8e50..000000000 --- a/build-scripts/semistaticg++ +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python -import sys,os - -args = sys.argv[1:] -if '-static' not in args: - os.execvp('g++', ['g++']+args) - -libs = [] -otherargs = [] -for arg in args: - if arg == '-static': - continue - if arg.startswith('/usr/lib') or (arg.startswith('-l') and arg not in ('-lm','-ldl','-lpthread')): - libs.append(arg) - else: - otherargs.append(arg) - -gargv=['gcc']+otherargs+['-Wl,-Bstatic']+libs+['-lstdc++','-Wl,-Bdynamic','-static-libgcc','-lm','-ldl'] -os.execvp('gcc', gargv) diff --git a/docs/markdown/appendix/compiling-powerdns.md b/docs/markdown/appendix/compiling-powerdns.md index ea6510c0d..0f62d9413 100644 --- a/docs/markdown/appendix/compiling-powerdns.md +++ b/docs/markdown/appendix/compiling-powerdns.md @@ -40,9 +40,7 @@ The FreeBSD Boost include files are installed in `/usr/local/include`, so prefix ### Linux Linux is probably the best supported platform as most of the main coders are -Linux users. The static DEB distribution is known to have problems on Debian -'Sid', but that doesn't matter as PowerDNS is a native part of Debian 'Sid'. -Just `apt-get`! +Linux users. ### Mac OS X The [installation from Homebrew](../authoritative/installation.md#mac-os-x) diff --git a/docs/markdown/authoritative/installation.md b/docs/markdown/authoritative/installation.md index 0d7f6d22c..961095b76 100644 --- a/docs/markdown/authoritative/installation.md +++ b/docs/markdown/authoritative/installation.md @@ -3,7 +3,6 @@ Installation of the PowerDNS Authoritative server on UNIX systems can be done in * Binary packages provided by your distribution * Binary packages provided by PowerDNS on [repo.powerdns.com](https://repo.powerdns.com) - * Using the statically linked binary packages provided on the [website](https://www.powerdns.com/downloads.html) (not available for 4.X) * Compiling from source ## Binary Packages @@ -20,12 +19,6 @@ Debian splits the backends into [several different packages](https://packages.de # apt-get install pdns-backend-$backend ``` -A statically linked package can be installed by downloading it and issueing: - -``` -# dpkg -i pdns-static_$version_$arch.deb -``` - ### Redhat-based Systems On RedHat based system there are 2 options to install PowerDNS, from [EPEL](https://fedoraproject.org/wiki/EPEL), the [repository from Kees diff --git a/docs/markdown/httpapi/README.md b/docs/markdown/httpapi/README.md index 751401003..5779be903 100644 --- a/docs/markdown/httpapi/README.md +++ b/docs/markdown/httpapi/README.md @@ -7,13 +7,6 @@ version 3.4, for the Recursor starting with version 3.6. The released versions use the standard webserver password for authentication, while newer versions use a static API key mechanism (shown below). -You can get suitable packages for testing (RPM or DEB) from these links: - - * https://autotest.powerdns.com/job/auth-git-semistatic-deb-amd64/lastSuccessfulBuild/artifact/ - * https://autotest.powerdns.com/job/auth-git-semistatic-rpm-amd64/lastSuccessfulBuild/artifact/ - * https://autotest.powerdns.com/job/recursor-git-semistatic-pkgs-amd64/lastSuccessfulBuild/artifact/ - - Try it ------ -- 2.50.1