testing/outils: upgrade to 0.3

2 files changed, 10 insertions, 218 deletions

diff --git a/testing/outils/APKBUILD b/testing/outils/APKBUILD
index 77a7108285..4dbb5bf13d 100644
--- a/testing/outils/APKBUILD
+++ b/testing/outils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=outils
-pkgver=0.2
-pkgrel=2
+pkgver=0.3
+pkgrel=0
 pkgdesc="Port of some non-standard OpenBSD tools to Linux"
 url="https://github.com/chneukirchen/outils"
 arch="all"
@@ -12,18 +12,14 @@ depends_dev=""
 makedepends="openssl-dev linux-headers"
 install=""
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/chneukirchen/$pkgname/archive/v$pkgver.tar.gz
-	include-sys-types.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/chneukirchen/$pkgname/archive/v$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	find "$_builddir"/src -type f -exec sed -i \{\} -e "s;u_int;uint;g" \
+		-e "s;u_char;uint8_t;g" \; || return 1
+	sed -i "$_builddir"/src/liboutils/sha1.c \
+		-e "s;uint i;uint32_t i;" || return 1
 }
 
 build() {
@@ -40,9 +36,6 @@ package() {
 	rm -f "$pkgdir"/usr/share/man/man1/cksum.1 || return 1
 }
 
-md5sums="9b4be449ff568baedc3d3aac4dfaf6e0  outils-0.2.tar.gz
-ff9943b103c7597b371435cc7323f775  include-sys-types.patch"
-sha256sums="e37626abd95ada936250938f4142161f70dae8247257db946708d6a87e785ddc  outils-0.2.tar.gz
-ce2810972f5c30389f87f5c4f68b6a31cd45369e4deeb2b2e90df46b2b367320  include-sys-types.patch"
-sha512sums="8a54a0c260c9a5a18f9ec0c0265d7b4195f64bb41845628fd4b4e1e066920ac7abc49372c817e9311c2ecc787c603d5d5d0905432c26f184b76a30bd82b0801e  outils-0.2.tar.gz
-1d6e0984038ffba618d8f08a002c5589da76e2872b9e434c4c470180f2d67f977ad803be734d30ea7eee57286d356da86ef959f90e75255697d42c957ecab9c7  include-sys-types.patch"
+md5sums="cb5d6274c78fd5dab8d5612668db08a3  outils-0.3.tar.gz"
+sha256sums="de4c947f8b71513c01a07e7f8e0958a891d3484cea0485d29ec531fa75042d64  outils-0.3.tar.gz"
+sha512sums="cd6d4bb92d1a867fbc9447b8ff993a21c65daa1b0ed46ea1911cdd461e466384b688cb5137dd62996c4980ef6fb9276651132703bbcdd1f61518dd68d2bcbbe4  outils-0.3.tar.gz"
diff --git a/testing/outils/include-sys-types.patch b/testing/outils/include-sys-types.patch
deleted file mode 100644
index ed0ef0a134..0000000000
--- a/testing/outils/include-sys-types.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -upr outils-0.2.orig/src/liboutils/include/md5.h outils-0.2/src/liboutils/include/md5.h
---- outils-0.2.orig/src/liboutils/include/md5.h	2015-09-28 19:50:34.846460036 +0200
-+++ outils-0.2/src/liboutils/include/md5.h	2015-09-28 19:50:43.476423394 +0200
-@@ -1,5 +1,3 @@
--/*	$OpenBSD: md5.h,v 1.17 2012/12/05 23:19:57 deraadt Exp $	*/
--
- /*
-  * This code implements the MD5 message-digest algorithm.
-  * The algorithm is due to Ron Rivest.  This code was
-@@ -12,6 +10,8 @@
-  * with every copy.
-  */
- 
-+#include<sys/types.h>
-+
- #ifndef _MD5_H_
- #define _MD5_H_
- 
-diff -upr outils-0.2.orig/src/liboutils/include/rmd160.h outils-0.2/src/liboutils/include/rmd160.h
---- outils-0.2.orig/src/liboutils/include/rmd160.h	2015-09-28 19:50:34.846460036 +0200
-+++ outils-0.2/src/liboutils/include/rmd160.h	2015-09-28 19:50:43.476423394 +0200
-@@ -22,6 +22,9 @@
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
-+
-+#include<sys/types.h>
-+
- #ifndef  _RMD160_H
- #define  _RMD160_H
- 
-diff -upr outils-0.2.orig/src/liboutils/include/sha1.h outils-0.2/src/liboutils/include/sha1.h
---- outils-0.2.orig/src/liboutils/include/sha1.h	2015-09-28 19:50:34.846460036 +0200
-+++ outils-0.2/src/liboutils/include/sha1.h	2015-09-28 19:50:43.476423394 +0200
-@@ -6,6 +6,8 @@
-  * 100% Public Domain
-  */
- 
-+#include <sys/types.h>
-+
- #ifndef _SHA1_H
- #define _SHA1_H
- 
-diff -upr outils-0.2.orig/src/liboutils/include/sha2.h outils-0.2/src/liboutils/include/sha2.h
---- outils-0.2.orig/src/liboutils/include/sha2.h	2015-09-28 19:50:34.846460036 +0200
-+++ outils-0.2/src/liboutils/include/sha2.h	2015-09-28 19:50:43.479756713 +0200
-@@ -34,6 +34,8 @@
-  * $From: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
-  */
- 
-+#include<sys/types.h>
-+
- #ifndef _SHA2_H
- #define _SHA2_H
- 
-diff -upr outils-0.2.orig/src/liboutils/md5hl.c outils-0.2/src/liboutils/md5hl.c
---- outils-0.2.orig/src/liboutils/md5hl.c	2015-09-28 19:50:34.846460036 +0200
-+++ outils-0.2/src/liboutils/md5hl.c	2015-09-28 19:50:43.479756713 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/rmd160hl.c outils-0.2/src/liboutils/rmd160hl.c
---- outils-0.2.orig/src/liboutils/rmd160hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/rmd160hl.c	2015-09-28 19:50:43.479756713 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/sha1.c outils-0.2/src/liboutils/sha1.c
---- outils-0.2.orig/src/liboutils/sha1.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha1.c	2015-09-28 19:50:43.479756713 +0200
-@@ -14,6 +14,7 @@
-  *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <string.h>
- #include <sha1.h>
-diff -upr outils-0.2.orig/src/liboutils/sha1hl.c outils-0.2/src/liboutils/sha1hl.c
---- outils-0.2.orig/src/liboutils/sha1hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha1hl.c	2015-09-28 19:50:43.483090032 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/sha224hl.c outils-0.2/src/liboutils/sha224hl.c
---- outils-0.2.orig/src/liboutils/sha224hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha224hl.c	2015-09-28 19:50:43.483090032 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/sha256hl.c outils-0.2/src/liboutils/sha256hl.c
---- outils-0.2.orig/src/liboutils/sha256hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha256hl.c	2015-09-28 19:50:43.483090032 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/sha384hl.c outils-0.2/src/liboutils/sha384hl.c
---- outils-0.2.orig/src/liboutils/sha384hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha384hl.c	2015-09-28 19:50:43.483090032 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/liboutils/sha512hl.c outils-0.2/src/liboutils/sha512hl.c
---- outils-0.2.orig/src/liboutils/sha512hl.c	2015-09-28 19:50:34.849793355 +0200
-+++ outils-0.2/src/liboutils/sha512hl.c	2015-09-28 19:50:43.483090032 +0200
-@@ -21,6 +21,7 @@
-  * can buy me a beer in return. Poul-Henning Kamp
-  */
- 
-+#include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- 
-diff -upr outils-0.2.orig/src/usr.bin/gzsig/gzip.h outils-0.2/src/usr.bin/gzsig/gzip.h
---- outils-0.2.orig/src/usr.bin/gzsig/gzip.h	2015-09-28 19:50:34.853126674 +0200
-+++ outils-0.2/src/usr.bin/gzsig/gzip.h	2015-09-28 19:50:43.486423352 +0200
-@@ -31,6 +31,8 @@
-  * $Vendor: gzip.h,v 1.2 2005/04/01 16:47:31 dugsong Exp $
-  */
- 
-+#include<sys/types.h>
-+
- #ifndef GZIP_H
- #define GZIP_H
- 
-diff -upr outils-0.2.orig/src/usr.bin/gzsig/key.h outils-0.2/src/usr.bin/gzsig/key.h
---- outils-0.2.orig/src/usr.bin/gzsig/key.h	2015-09-28 19:50:34.853126674 +0200
-+++ outils-0.2/src/usr.bin/gzsig/key.h	2015-09-28 19:50:43.486423352 +0200
-@@ -31,6 +31,8 @@
-  * $Vendor: key.h,v 1.2 2005/04/01 16:47:31 dugsong Exp $
-  */
- 
-+#include<sys/types.h>
-+
- #ifndef KEY_H
- #define KEY_H
- 
-diff -upr outils-0.2.orig/src/usr.sbin/rdate/ntp.c outils-0.2/src/usr.sbin/rdate/ntp.c
---- outils-0.2.orig/src/usr.sbin/rdate/ntp.c	2015-09-28 19:50:34.856459993 +0200
-+++ outils-0.2/src/usr.sbin/rdate/ntp.c	2015-09-28 19:51:42.569505829 +0200
-@@ -29,6 +29,7 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
-diff -upr outils-0.2.orig/src/usr.sbin/rdate/ntpleaps.h outils-0.2/src/usr.sbin/rdate/ntpleaps.h
---- outils-0.2.orig/src/usr.sbin/rdate/ntpleaps.h	2015-09-28 19:50:34.856459993 +0200
-+++ outils-0.2/src/usr.sbin/rdate/ntpleaps.h	2015-09-28 19:51:30.746222696 +0200
-@@ -41,6 +41,8 @@
-  * leap second zoneinfo files and userland support anyways.
-  */
- 
-+#include<sys/types.h>
-+
- #ifndef _NTPLEAPS_H
- #define _NTPLEAPS_H
- 
-diff -upr outils-0.2.orig/src/usr.sbin/rdate/rfc868time.c outils-0.2/src/usr.sbin/rdate/rfc868time.c
---- outils-0.2.orig/src/usr.sbin/rdate/rfc868time.c	2015-09-28 19:50:34.856459993 +0200
-+++ outils-0.2/src/usr.sbin/rdate/rfc868time.c	2015-09-28 19:51:39.852850698 +0200
-@@ -39,6 +39,7 @@
-  *	midnight January 1st 1900.
-  */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>