Mercurial > vanilla

changeset 141:21e18b280dea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
network: merge .sh and .info
author David Demelier <markand@malikania.fr>
date Mon, 11 Mar 2019 20:10:00 +0100
parents ef65bd5eb573
children c3e9685afe86
files network/inetutils/inetutils.info network/inetutils/inetutils.sh network/openssh/openssh.info network/openssh/openssh.sh network/openssl/openssl.info network/openssl/openssl.sh network/wget/wget.info network/wget/wget.sh
diffstat 8 files changed, 155 insertions(+), 213 deletions(-) [+]
line wrap: on
line diff
--- a/network/inetutils/inetutils.info	Mon Mar 11 16:33:11 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=inetutils
-PKGVERSION=1.9.4
-PKGREVISION=1
-PKGLICENSE="GPLv3"
-PKGSUMMARY="GNU network programs"
-PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
--- a/network/inetutils/inetutils.sh	Mon Mar 11 16:33:11 2019 +0100
+++ b/network/inetutils/inetutils.sh	Mon Mar 11 20:10:00 2019 +0100
@@ -15,38 +15,52 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=inetutils
+PKGVERSION=1.9.4
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="GNU network programs"
+PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
+: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./inetutils.info
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-set -ex
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--target=$CTARGET \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--without-pam \
-	--disable-rcp \
-	--disable-rlogin \
-	--disable-rlogind \
-	--disable-rsh \
-	--disable-rshd \
-	--disable-talk \
-	--disable-talkd
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--without-pam \
+		--disable-rcp \
+		--disable-rlogin \
+		--disable-rlogind \
+		--disable-rsh \
+		--disable-rshd \
+		--disable-talk \
+		--disable-talkd
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
--- a/network/openssh/openssh.info	Mon Mar 11 16:33:11 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=openssh
-PKGVERSION=7.9p1
-PKGREVISION=1
-PKGLICENSE="BSD"
-PKGSUMMARY="OpenBSD ssh implementation"
-PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKGNAME-$PKGVERSION.tar.gz"
-PKGPROTECT="etc/ssh/ssh_config etc/ssh/sshd_config"
--- a/network/openssh/openssh.sh	Mon Mar 11 16:33:11 2019 +0100
+++ b/network/openssh/openssh.sh	Mon Mar 11 20:10:00 2019 +0100
@@ -15,36 +15,49 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=openssh
+PKGVERSION=7.9p1
+PKGREVISION=1
+PKGLICENSE="BSD"
+PKGSUMMARY="OpenBSD ssh implementation"
+PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKGNAME-$PKGVERSION.tar.gz"
+PKGPROTECT="etc/ssh/ssh_config etc/ssh/sshd_config"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
+: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
-
-source ./openssh.info
-
-set -ex
+: ${LDFLAGS:=}
+: ${LIBS:=}
 
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
 
-patch -p1 < ../CVE-2018-20685.patch
-patch -p1 < ../CVE-2019-6109.patch
-patch -p1 < ../CVE-2019-6111.patch
+	patch -p1 < ../CVE-2018-20685.patch
+	patch -p1 < ../CVE-2019-6109.patch
+	patch -p1 < ../CVE-2019-6111.patch
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr \
-	--sysconfdir=/etc/ssh \
-	--without-pam \
-	--with-pid-dir=/var/run \
-	--without-selinux
-make
-make install DESTDIR=$DESTDIR
-install -D -m 0644 ../sshd /etc/rc.d/sshd
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr
+		--sysconfdir=/etc/ssh \
+		--without-pam \
+		--with-pid-dir=/var/run \
+		--without-selinux
+	make
+	make install DESTDIR=$DESTDIR
+	install -D -m 0644 ../sshd /etc/rc.d/sshd
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
--- a/network/openssl/openssl.info	Mon Mar 11 16:33:11 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=openssl
-PKGVERSION=1.1.1a
-PKGREVISION=1
-PKGLICENSE="CUSTOM"
-PKGSUMMARY="toolkit for SSL/TLS"
-PKGDOWNLOAD="https://www.openssl.org/source/$PKGNAME-$PKGVERSION.tar.gz"
--- a/network/openssl/openssl.sh	Mon Mar 11 16:33:11 2019 +0100
+++ b/network/openssl/openssl.sh	Mon Mar 11 20:10:00 2019 +0100
@@ -15,40 +15,46 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-source ./openssl.info
+PKGNAME=openssl
+PKGVERSION=1.1.1a
+PKGREVISION=1
+PKGLICENSE="CUSTOM"
+PKGSUMMARY="toolkit for SSL/TLS"
+PKGDOWNLOAD="https://www.openssl.org/source/$PKGNAME-$PKGVERSION.tar.gz"
+
+: ${CC:=gcc}
+: ${CFLAGS:=-O2}
 
 case $(uname -m) in
 x86_64)
-	CFLAGS="-O2 -fPIC"
 	TRIPLET="linux-x86_64"
 	;;
 arm*)
-	CFLAGS="-O2"
 	TRIPLET="linux-armv4"
 	;;
 aarch*)
-	CFLAGS="-O2"
 	TRIPLET="linux-aarch64"
 	;;
 esac
 
-set -e
-
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	pushd $PKGNAME-$PKGVERSION
 
-patch -p0 < ../ca-directory.patch
-./Configure \
-	--prefix=/usr \
-	--openssldir=/etc/ssl \
-	--libdir=lib \
-	shared linux-x86_64
-	CFLAGS="$CFLAGS"
-make depend
-make
-make install DESTDIR=$DESTDIR
-rm -f $DESTDIR/usr/lib/lib{crypto,ssl}.a
+	patch -p0 < ../ca-directory.patch
+	./Configure \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=lib \
+		shared linux-x86_64
+		CC="$CC" CFLAGS="$CFLAGS"
+	make depend
+	make
+	make install DESTDIR=$DESTDIR
+	rm -f $DESTDIR/usr/lib/lib{crypto,ssl}.a
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}
--- a/network/wget/wget.info	Mon Mar 11 16:33:11 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 David Demelier <markand@malikania.fr>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-PKGNAME=wget
-PKGVERSION=1.20.1
-PKGREVISION=1
-PKGLICENSE="GPLv3"
-PKGSUMMARY="GNU network utility to retrieve files from the web"
-PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.lz"
-PKGDEPENDS="network/gnutls lib/libunistring lib/zlib"
-PKGOPTIONS="NLS SSL UUID"
-
-if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
-fi
-
-if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="network/openssl $PKGDEPENDS"
-elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="network/gnutls $PKGDEPENDS"
-fi
-
-if [ "$UUID" = "yes" ]; then
-	PKGDEPENDS="core/util-linux $PKGDEPENDS"
-fi
--- a/network/wget/wget.sh	Mon Mar 11 16:33:11 2019 +0100
+++ b/network/wget/wget.sh	Mon Mar 11 20:10:00 2019 +0100
@@ -15,54 +15,72 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
+PKGNAME=wget
+PKGVERSION=1.20.1
+PKGREVISION=1
+PKGLICENSE="GPLv3"
+PKGSUMMARY="GNU network utility to retrieve files from the web"
+PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.lz"
+PKGDEPENDS="network/gnutls lib/libunistring lib/zlib"
+PKGOPTIONS="NLS SSL UUID"
+
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
+: ${CTARGET:=$(uname -m)-linux-musl}
 : ${CC:=gcc}
 : ${CFLAGS:=-O2}
+: ${LDFLAGS:=}
+: ${LIBS:=}
 : ${SSL:=gnutls}       # upstream default
 : ${NLS:=yes}
 : ${UUID:=yes}
 
-source ./wget.info
-
-set -ex
-
-if [ "$SSL" = "openssl" ]; then
-	with_ssl="--with-ssl=openssl"
-elif [ "$SSL" = "gnutls" ]; then
-	with_ssl="--with-ssl=gnutls"
-elif [ "$SSL" = "no" ]; then
-	with_ssl="--without-ssl"
-fi
-
 if [ "$NLS" = "yes" ]; then
+	PKGDEPENDS="core/gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
+if [ "$SSL" = "openssl" ]; then
+	PKGDEPENDS="network/openssl $PKGDEPENDS"
+	with_ssl="--with-ssl=openssl"
+elif [ "$SSL" = "gnutls" ]; then
+	PKGDEPENDS="network/gnutls $PKGDEPENDS"
+	with_ssl="--with-ssl=gnutls"
+else
+	with_ssl="--without-ssl"
+fi
+
 if [ "$UUID" = "yes" ]; then
+	PKGDEPENDS="core/util-linux $PKGDEPENDS"
 	with_uuid="--with-uuid"
 else
 	with_uuid="--without-uuid"
 fi
 
-rm -rf $PKGNAME-$PKGVERSION
-tar xvaf $PKGNAME-$PKGVERSION.tar.lz
-pushd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvaf $PKGNAME-$PKGVERSION.tar.lz
+	pushd $PKGNAME-$PKGVERSION
 
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr \
-	--without-included-libunistring \
-	${with_nls} \
-	${with_ssl} \
-	${with_uuid}
-make
-make install DESTDIR=$DESTDIR
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--target=$CTARGET \
+		--prefix=/usr
+		--without-included-libunistring \
+		$with_nls \
+		$with_ssl \
+		$with_uuid
+	make
+	make install DESTDIR=$DESTDIR
 
-popd
-rm -rf $PKGNAME-$PKGVERSION
+	popd
+	rm -rf $PKGNAME-$PKGVERSION
+}