From cf76556edfb53cd1cf46cf796ed94d95bf77d78f Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Mon, 16 Aug 2021 16:10:20 +0200 Subject: network/openresolv: Removed (added to Slackware). Signed-off-by: Matteo Bernardini --- network/openresolv/README | 17 ----- network/openresolv/doinst.sh | 18 ----- network/openresolv/openresolv.SlackBuild | 124 ------------------------------- network/openresolv/openresolv.info | 10 --- network/openresolv/slack-desc | 19 ----- network/openresolv/update-resolv-conf | 54 -------------- 6 files changed, 242 deletions(-) delete mode 100644 network/openresolv/README delete mode 100644 network/openresolv/doinst.sh delete mode 100644 network/openresolv/openresolv.SlackBuild delete mode 100644 network/openresolv/openresolv.info delete mode 100644 network/openresolv/slack-desc delete mode 100644 network/openresolv/update-resolv-conf diff --git a/network/openresolv/README b/network/openresolv/README deleted file mode 100644 index abe4b9d7c7..0000000000 --- a/network/openresolv/README +++ /dev/null @@ -1,17 +0,0 @@ -openresolv (management framework for resolv.conf) - -Allows multiple daemons to manage resolv.conf and configures local -resolvers such as dnsmasq and unbound. - -This package may require some manual configuration. Please read -resolvconf(8) and resolvconf.conf(5) for detailed instructions. - -Passing OPENVPN=yes will add the update-resolv-conf script to -/etc/openvpn/. To use the script, make sure the following lines are -added to your openvpn client configuration file. - -up /etc/openvpn/update-resolv-conf -down /etc/openvpn/update-resolv-conf - -Please consult /etc/openvpn/update-resolv-conf before using the script. -It will likely require editing before use. diff --git a/network/openresolv/doinst.sh b/network/openresolv/doinst.sh deleted file mode 100644 index 810b1c10cb..0000000000 --- a/network/openresolv/doinst.sh +++ /dev/null @@ -1,18 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/resolvconf.conf.new -# This file is optional (added with OPENVPN=yes); let's make sure it exists -if [ -e etc/openvpn/update-resolv-conf.new ]; then - config etc/openvpn/update-resolv-conf.new -fi diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild deleted file mode 100644 index 53952510fc..0000000000 --- a/network/openresolv/openresolv.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# Slackware build script for openresolv - -# Copyright 2012-2013 synbq Bucharest -# Copyright 2017-2021 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=openresolv -VERSION=${VERSION:-3.12.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -# If building openvpn support, ensure it's installed -if [ "${OPENVPN:-no}" = "yes" ] && [ ! -d /etc/openvpn ]; then - echo "You must to have openvpn installed" - exit 1 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libexecdir=/usr/libexec/openresolv \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp README.md $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -if [ "${OPENVPN}" = "yes" ]; then - mkdir -p $PKG/etc/openvpn - install -m 0755 $CWD/update-resolv-conf $PKG/etc/openvpn/update-resolv-conf.new -fi - -mv $PKG/etc/resolvconf.conf $PKG/etc/resolvconf.conf.new - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/network/openresolv/openresolv.info b/network/openresolv/openresolv.info deleted file mode 100644 index 3a5cdc223e..0000000000 --- a/network/openresolv/openresolv.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="openresolv" -VERSION="3.12.0" -HOMEPAGE="https://roy.marples.name/projects/openresolv" -DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.12.0.tar.xz" -MD5SUM="595f8633c111c150b86825b027e0bbde" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/network/openresolv/slack-desc b/network/openresolv/slack-desc deleted file mode 100644 index 1b64db5fe9..0000000000 --- a/network/openresolv/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -openresolv: openresolv (management framework for resolv.conf) -openresolv: -openresolv: Allows multiple daemons to manage resolv.conf and configures local -openresolv: resolvers such as dnsmasq and unbound. -openresolv: This package may require some manual configuration. -openresolv: Please read resolvconf(8) and resolvconf.conf(5) for detailed -openresolv: instructions. -openresolv: -openresolv: Visit the openresolv project online: -openresolv: https://roy.marples.name/projects/openresolv -openresolv: diff --git a/network/openresolv/update-resolv-conf b/network/openresolv/update-resolv-conf deleted file mode 100644 index a20260576e..0000000000 --- a/network/openresolv/update-resolv-conf +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Parses DHCP options from openvpn to update resolv.conf -# To use set as 'up' and 'down' script in your openvpn *.conf: -# up /etc/openvpn/update-resolv-conf -# down /etc/openvpn/update-resolv-conf -# -# Used snippets of resolvconf script by Thomas Hood -# and Chris Hanson -# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL. -# -# 05/2006 chlauber@bnc.ch -# -# Example envs set from openvpn: -# foreign_option_1='dhcp-option DNS 193.43.27.132' -# foreign_option_2='dhcp-option DNS 193.43.27.133' -# foreign_option_3='dhcp-option DOMAIN be.bnc.ch' - -[ -x /usr/sbin/resolvconf ] || exit 0 - -case $script_type in - -up) - for optionname in ${!foreign_option_*} ; do - option="${!optionname}" - echo $option - part1=$(echo "$option" | cut -d " " -f 1) - if [ "$part1" == "dhcp-option" ] ; then - part2=$(echo "$option" | cut -d " " -f 2) - part3=$(echo "$option" | cut -d " " -f 3) - if [ "$part2" == "DNS" ] ; then - IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3" - fi - if [ "$part2" == "DOMAIN" ] ; then - IF_DNS_SEARCH="$IF_DNS_SEARCH $part3" - fi - fi - done - R="" - for SS in $IF_DNS_SEARCH ; do - R="${R}search $SS -" - done - for NS in $IF_DNS_NAMESERVERS ; do - R="${R}nameserver $NS -" - done - echo -n "$R" | /usr/sbin/resolvconf -x -a "${dev}.inet" - ;; -down) - /usr/sbin/resolvconf -d "${dev}.inet" - ;; -esac - -- cgit v1.2.3