diff options
| -rw-r--r-- | network/openresolv/doinst.sh | 14 | ||||
| -rw-r--r-- | network/openresolv/openresolv.SlackBuild | 28 | ||||
| -rw-r--r-- | network/openresolv/openresolv.info | 6 |
3 files changed, 35 insertions, 13 deletions
diff --git a/network/openresolv/doinst.sh b/network/openresolv/doinst.sh new file mode 100644 index 0000000000000..8859585e9681f --- /dev/null +++ b/network/openresolv/doinst.sh @@ -0,0 +1,14 @@ +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 diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild index 2007286a3d913..61e7e7eef09d3 100644 --- a/network/openresolv/openresolv.SlackBuild +++ b/network/openresolv/openresolv.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openresolv -VERSION=${VERSION:-3.5.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -52,8 +52,8 @@ else fi fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,14 +72,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2 +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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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" \ @@ -94,6 +94,10 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +if [ "$ARCH" = "x86_64" ]; then + mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} +fi + 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 @@ -101,6 +105,7 @@ 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 $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild if [ "${OPENVPN}" = "yes" ]; then @@ -108,8 +113,11 @@ if [ "${OPENVPN}" = "yes" ]; then $USE_OPENVPN 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:-tgz} diff --git a/network/openresolv/openresolv.info b/network/openresolv/openresolv.info index 6b9b49ff2c7db..47096235d765f 100644 --- a/network/openresolv/openresolv.info +++ b/network/openresolv/openresolv.info @@ -1,8 +1,8 @@ PRGNAM="openresolv" -VERSION="3.5.4" +VERSION="3.9.0" HOMEPAGE="https://roy.marples.name/projects/openresolv" -DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.5.4.tar.bz2" -MD5SUM="617a52fbe6f253f231d9f78f1ea74281" +DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz" +MD5SUM="177ad48b768d4d1bf37510f1af99dffe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |