Fix some old packages

3 files changed, 116 insertions, 1 deletions

diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
index 5bb9abe..de889db 100644
--- a/sys-apps/mkinitrd/Manifest
+++ b/sys-apps/mkinitrd/Manifest
@@ -1,6 +1,7 @@
 AUX mdadm-ds-static.patch 666 BLAKE2B da10e2d68ec47dd47a9ca36496032ba79c2d492dec821db2b322a81fa7ac4969d05b3ab0892de615b7b865ede0731db9914768efbb62a8c11992e1a31c1e75df SHA512 ac2c5cac8bb65a634c6b55d5338d1353e5979b18bd27d2147d13df565d3cf021b4cf4755bf9d548ead0a8e779fd5e06792bfa7247e62fdd06b270eb2db542c49
 AUX mkinitrd-4.2.17-mdk.patch.bz2 21102 BLAKE2B 8528467febea22709bb02e415292528fd6785292b5595a0f4517dbf03d0fe487227d15ac7978804b2ddc2c08fda0dae083c0bc0c37681a532018227979c27dbf SHA512 659bbe3d2e15f3f59e3bb21d73b420c35c29c3e63e56c97faa15deeb6c3615005c3cc0e7577f7b8b44924499f8e8cb45492dd212422516ba6e52457feea13b73
 AUX mkinitrd-6.0.93-ds.diff 4274 BLAKE2B 33fd6f22fb45a58cdc83b67b81fc45ba1c724ee7d7619e5bf6f4fbe4c4da573aa41e0be54f0ba53c62f967bd0ed07b237a69ebe6d9c063743ed586539435c434 SHA512 dd9880bf594bfd131f0df94ebb904605cfdc4632ee19e552b051956bd4eefe3f7f2189234e03e49db3fcfe041ed6e8859173e71801cf411732a334b4394e8491
+AUX mkinitrd-6.0.93-ds2.diff 4039 BLAKE2B c8f54db7ec8f931cf34d516e193168901888bd8b0128d15f6286dd2e5f2a041153ca569ae055edce3ca4b2877d5c8e470cb47dd7ede11a99bc224cb62c984cde SHA512 c7442a1678e98234517d90084bede37e9fbc725932c09ab234b7390ba2e3417da6c43a2a6bc9982acf71d369f3a4aa27574f6f37ae6ddb2b0f43ae956b521e37
 AUX mkinitrd-ds-grubby_compile.patch 915 BLAKE2B 2a62f8ab88557eecbdfb1f15d6881cd62d3d2dc4aece72d4134d2c06d2207da52be6adbd4138b240c4cdbb8d7ec51b9d2fa32ffb72e156cd4bab9932de398d7b SHA512 1349b7774b92ef954ea3a3421f67261ccc4f660cfb1a9d7d51e6026feb9f551f8e4f315af59c55ea88c2effda0baa4cd21976e89c51fb9ef8e42f29324d62576
 AUX mkinitrd-ds-raid.patch 627 BLAKE2B ea2580e116f2a02b173bccbf00dba5b77dcaeb89b3ae4e89c2be433f2d626bf9ec6d6fa5f1816645a634cb733ed8e39b6f23ca113bf3b62ae136a463fc33c988 SHA512 742fac5f4e6ec84a1b65a429235c73997cf4eb9438ab7cce31027616b8a488a702e50004ad752de9404a6ff57528c72eaa4ad21e07bfce1deae812558db96d74
 AUX mkinitrd-ds-vitalsunion.diff 1724 BLAKE2B 2f1ba8d3d85fe5f8d992f74f479b6041f932fd48c19aadeb61fa1bd2dba3675f7487cdc6fb042b53e1ee3684ec50ae115a7d0b6d4f8a30060044abfba414d5dc SHA512 f212f5dfe69eaefaa0c1d2d9294203d64572a6bb8dce7f88ad2380f10b4141985a2acdee62301a1867cf24ac6eedf479adaf79790f0eb41e5335ff6af9f16e5c
@@ -13,4 +14,4 @@ DIST mdadm-2.1.tar.bz2 103201 BLAKE2B febcdb43e3e87cc92b60de232883f985480d9b972b
 DIST mkinitrd-4.2.17.tar.bz2 65568 BLAKE2B 576efc36c78fb2fd9840858fc44f7c40382c8e2132c13960ec7106f7165e84c3bd3c0846cb4f2583934eb37dcdfc7191eca6c1548f68ca0a06907226e4d400c8 SHA512 8bf3b65543cf167d8c5e74b058003322b3d0e23620a98714a7b819ebbab56e03d9213611fc1bf56a5063d10e3ef341f79e89e0af987db2ea80e71e5355febf49
 DIST mkinitrd-6.0.93.tar.bz2 124410 BLAKE2B 5b0877f1fac709db8561ff829aac29972a1efbf46b2c52430d744ad537827a7ed4e2c89a1d12ddc09188a91e9e70c7294a5781d460018eda7dbdba4ff3d891c0 SHA512 080019cffd561e00ca055528265fd30dd475e6fc82e0676ca153ab388aa2f731cd8929822d06fc6fec2f770eb1577e592e99b247e64985c4df6f3b8d4167b9e7
 EBUILD mkinitrd-4.2.17-r3.ebuild 1867 BLAKE2B a62466cca52f8ea329d775e772dd01bdf871ddb8ed33359902be4995876287921ec8311094ffba25e509e3b3c0f748fe58b714fdd4afd60ad7107f46d9c77031 SHA512 1300ac21a5dd0a4e9b667a81a70e28eff201011476b5ffc3616c17e3bc5e98576b9595bdde49782d91129c2a6541fb7957620f5d881faf25701f896cf09b051e
-EBUILD mkinitrd-6.0.93-r1.ebuild 1148 BLAKE2B b434b4acaa874553b9df83b347aa5f03b1f58d26fbcb75718612a5d80d3e8525a1294917822f4d9930df4e956504984bbd74f16e88229a57e76f5af6fd59fe1c SHA512 81e3b2868ba9782c275f24455211812d2ec40fbc210816caa83792105d14dad894fd15b3a45751d49ec78ae870c9a095d03aefa5fa0bfa41356f46e4306c4691
+EBUILD mkinitrd-6.0.93-r2.ebuild 1202 BLAKE2B 897e2fe4965bf9c46206e78014402b0a5c55205d2fa535c8a65a756502c84475b6d07727fc390477356b8624791c8b0b3119e8023857e9f0c3e5afed1faf8119 SHA512 0bc2b57d8246ca08f51869e2d0267fd116b06e5cf091c72613ac49a2d3239f8f31691b5178bab17276b08983b48413d6dd9069246c89f3b94fcfa02dfd1d16ee
diff --git a/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff b/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff
new file mode 100644
index 0000000..fa41433
--- /dev/null
+++ b/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff
@@ -0,0 +1,113 @@
+diff -dPNur mkinitrd-6.0.93-orig/bdevid/python/Makefile mkinitrd-6.0.93/bdevid/python/Makefile
+--- mkinitrd-6.0.93-orig/bdevid/python/Makefile	2019-10-25 20:25:33.733753651 +0200
++++ mkinitrd-6.0.93/bdevid/python/Makefile	2019-10-25 20:39:23.029000459 +0200
+@@ -25,7 +25,7 @@
+ include $(TOPDIR)/Makefile.inc
+ 
+ SITELIB := $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")
+-PYVER := $(shell python -c "import sys; print sys.version[0:3]")
++PYVER := $(shell python2 -c "import sys; print (sys.version[0:3])")
+ CFLAGS += -I/usr/include/python$(PYVER)
+ CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
+ LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
+diff -dPNur mkinitrd-6.0.93-orig/bdevid/sysfs.c mkinitrd-6.0.93/bdevid/sysfs.c
+--- mkinitrd-6.0.93-orig/bdevid/sysfs.c	2009-09-02 10:41:45.000000000 +0200
++++ mkinitrd-6.0.93/bdevid/sysfs.c	2019-10-25 20:36:16.444012869 +0200
+@@ -30,6 +30,8 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#include <sys/sysmacros.h>
++
+ #include <nash.h>
+ 
+ #include "bdevid.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/block.c mkinitrd-6.0.93/nash/block.c
+--- mkinitrd-6.0.93-orig/nash/block.c	2019-10-25 20:25:31.293714823 +0200
++++ mkinitrd-6.0.93/nash/block.c	2019-10-25 20:34:13.839051611 +0200
+@@ -36,8 +36,8 @@
+ #include <envz.h>
+ 
+ #include <blkid/blkid.h>
+-
+ #include <linux/blkpg.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "lib.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/devtree.c mkinitrd-6.0.93/nash/devtree.c
+--- mkinitrd-6.0.93-orig/nash/devtree.c	2019-10-25 20:25:32.020726392 +0200
++++ mkinitrd-6.0.93/nash/devtree.c	2019-10-25 20:34:54.382699987 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "list.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/dm.c mkinitrd-6.0.93/nash/dm.c
+--- mkinitrd-6.0.93-orig/nash/dm.c	2019-10-25 20:25:31.514718340 +0200
++++ mkinitrd-6.0.93/nash/dm.c	2019-10-25 20:33:20.023191276 +0200
+@@ -30,6 +30,7 @@
+ 
+ #include <libdevmapper.h>
+ #include <parted/parted.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ 
+diff -dPNur mkinitrd-6.0.93-orig/nash/Makefile mkinitrd-6.0.93/nash/Makefile
+--- mkinitrd-6.0.93-orig/nash/Makefile	2019-10-25 20:25:33.724753507 +0200
++++ mkinitrd-6.0.93/nash/Makefile	2019-10-25 20:29:45.448764596 +0200
+@@ -31,7 +31,7 @@
+ 
+ include ../Makefile.inc
+ 
+-CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
++CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include -I/usr/include/tirpc
+ 
+ LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash
+ 
+@@ -39,6 +39,7 @@
+ nash_LIBS += -ldevmapper -lparted -lblkid
+ nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf
+ nash_LIBS += -lm
++nash_LIBS += -ltirpc
+ # We need to link against libgcc_s directly, or it'll /dlopen() it during
+ # backtrace()!  This is not teh way!!!1!!!one!!!.
+ nash_LIBS += -lgcc_s
+diff -dPNur mkinitrd-6.0.93-orig/nash/nash.c mkinitrd-6.0.93/nash/nash.c
+--- mkinitrd-6.0.93-orig/nash/nash.c	2019-10-25 20:25:32.636736194 +0200
++++ mkinitrd-6.0.93/nash/nash.c	2019-10-25 20:28:32.810606074 +0200
+@@ -60,6 +60,7 @@
+ #include <argz.h>
+ #include <asm/unistd.h>
+ #include <linux/fs.h>
++#include <sys/sysmacros.h>
+ 
+ #include <libdevmapper.h>
+ 
+diff -dPNur mkinitrd-6.0.93-orig/nash/procdev.c mkinitrd-6.0.93/nash/procdev.c
+--- mkinitrd-6.0.93-orig/nash/procdev.c	2009-09-02 10:41:45.000000000 +0200
++++ mkinitrd-6.0.93/nash/procdev.c	2019-10-25 20:32:15.464159654 +0200
+@@ -20,6 +20,8 @@
+  */
+ 
+ #define _GNU_SOURCE 1
++#include <sys/sysmacros.h>
++
+ #include "lib.h"
+ 
+ static struct proc_dev_info proc_dev_info[] = {
+diff -dPNur mkinitrd-6.0.93-orig/nash/waitdev.c mkinitrd-6.0.93/nash/waitdev.c
+--- mkinitrd-6.0.93-orig/nash/waitdev.c	2019-10-25 20:25:32.637736210 +0200
++++ mkinitrd-6.0.93/nash/waitdev.c	2019-10-25 20:32:07.404030893 +0200
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <bdevid.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "block.h"
diff --git a/sys-apps/mkinitrd/mkinitrd-6.0.93-r1.ebuild b/sys-apps/mkinitrd/mkinitrd-6.0.93-r2.ebuild
index 4498e66..2412cbd 100644
--- a/sys-apps/mkinitrd/mkinitrd-6.0.93-r1.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-6.0.93-r2.ebuild
@@ -30,6 +30,7 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}"/mkinitrd-ds-vitalsunion.diff || die
 	epatch "${FILESDIR}"/mkinitrd-6.0.93-ds.diff || die
+	epatch "${FILESDIR}"/mkinitrd-6.0.93-ds2.diff || die
 	find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 	sed -i -e 's|CFLAGS\s*[\?]=|CFLAGS +=|g' -e 's|LDFLAGS\s*[\?]=|LDFLAGS +=|g' Makefile.inc
 }