Added missing ioctl translations patch. Better handling of -r.

5 files changed, 18 insertions, 9 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index 9e40fecb4418..4c912da4d09c 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.27 2004/01/06 19:58:13 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.28 2004/01/07 00:01:13 gmsoft Exp $
 
 *hppa-sources-2.4.23_p4-r2 (06 Jan 2004)
 
+  06 Jan 2004; Guy Martin <gmsoft@gentoo.org> hppa-sources-2.4.23_p4-r2.ebuild :
+  Added missing ioctl translations patch. Better handling of -r.
+
   06 Jan 2004; <plasmaroo@gentoo.org> hppa-sources-2.4.23_p4-r2.ebuild,
   files/hppa-sources.CAN-2003-0985.patch, files/hppa-sources.rtc_fix.patch:
   Added patches to address the security vulnerabilities in bugs #37292 and
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index 404f47d061ab..e36b2ff48e2c 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 bc930c89e85e0b318f012b37ba0926ed ChangeLog 4034
+MD5 cfbc4402e59232bff31bf12b37efabc3 ChangeLog 4178
 MD5 51f36b719aef57601b622fca2df7dcac hppa-sources-2.4.21_p10.ebuild 1566
 MD5 3e8a90325c2148e1a02cb477ff04ca87 hppa-sources-2.4.21_p13.ebuild 1884
 MD5 9ef4b6ac1a5d02b0bfd4f49d7404511f hppa-sources-2.4.21_p2.ebuild 1087
@@ -13,8 +13,8 @@ MD5 bf8f1b8b6a52e8143591ae5e06050c7a hppa-sources-2.4.22_p6.ebuild 1800
 MD5 1c944d786538d3fcc7664f02fc1dd624 hppa-sources-2.4.23_p3.ebuild 1052
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
 MD5 bee2f1a7f9d66d115848622af53b8d33 hppa-sources-2.4.23_p4.ebuild 1714
-MD5 f30177716d47f34f7c2baab51e32f96c hppa-sources-2.4.23_p4-r1.ebuild 2374
-MD5 b42e0f04fac6f81656c929a2a8b3e531 hppa-sources-2.4.23_p4-r2.ebuild 2767
+MD5 a9410b4a56e7aba7dcbd9b48292279e8 hppa-sources-2.4.23_p4-r1.ebuild 2432
+MD5 9fb20888f5ff5272572f25a9516eea8c hppa-sources-2.4.23_p4-r2.ebuild 2826
 MD5 7743c939ccccf0343faed987e12b489b files/digest-hppa-sources-2.4.21_p10 334
 MD5 306724fa77532e2a73c383f7322f1e56 files/digest-hppa-sources-2.4.21_p13 469
 MD5 605092c92ae7fda21bdfc646556c3318 files/digest-hppa-sources-2.4.21_p2 136
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2
index e93a8fde744e..95b857101725 100644
--- a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.23_p4-r2
@@ -4,3 +4,4 @@ MD5 d1ef1d7ef6d68bee06aae58c824f82bc patch-2.4.23-pa1-pa2.gz 4141
 MD5 255e3de06190a68e71ebd960a51c53a8 patch-2.4.23-pa2-pa3.gz 919
 MD5 498c36aba7ea1e20436f83609867a9dd patch-2.4.23-pa3-pa4.gz 443
 MD5 fd23b7f3af634c6e93151cb48cbde8d8 xfs-2.4.23_p4-hppa.patch.bz2 1188535
+MD5 010fe6b49e97365f12ce3f70376d5eb0 parisc-2.4.23-pa4-missing-ioctl-translations.diff 18091
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild
index 7bbb8f100158..8ce2488d4fcc 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild,v 1.4 2004/01/06 19:58:13 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r1.ebuild,v 1.5 2004/01/07 00:01:13 gmsoft Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel
 OKV="${PV/_p*/}"
 PATCH_LEVEL="${PV/${OKV}_p/}"
-KV=${OKV}-pa${PATCH_LEVEL}
 EXTRAVERSION="-pa${PATCH_LEVEL}"
+[ ! "${PR}" = "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
 IUSE="xfs"
 
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild
index 7d419e4dcecc..691dff9a5aa8 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild,v 1.1 2004/01/06 19:58:13 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.23_p4-r2.ebuild,v 1.2 2004/01/07 00:01:13 gmsoft Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel
 OKV="${PV/_p*/}"
 PATCH_LEVEL="${PV/${OKV}_p/}"
-KV=${OKV}-pa${PATCH_LEVEL}
 EXTRAVERSION="-pa${PATCH_LEVEL}"
+[ ! "${PR}" = "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
 S=${WORKDIR}/linux-${KV}
 IUSE="xfs"
 
@@ -19,7 +21,8 @@ PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))"
 DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz
 `for i in \`seq 1 ${PATCH_COUNT}\`; do echo http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$i }\"\`-pa\`echo ${PATCH_SET} | awk \"{ print \\\\\$$((i + 1)) }\"\`.gz; done`
-xfs? ( http://dev.gentoo.org/~gmsoft/patches/xfs-${PV}-hppa.patch.bz2 )"
+xfs? ( http://dev.gentoo.org/~gmsoft/patches/xfs-${PV}-hppa.patch.bz2 )
+http://dev.gentoo.org/~gmsoft/patches/parisc-2.4.23-pa4-missing-ioctl-translations.diff"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
 KEYWORDS="~hppa -*"
 SLOT="${KV}"
@@ -63,6 +66,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+	epatch ${DISTDIR}/parisc-2.4.23-pa4-missing-ioctl-translations.diff || die "Failed to patch missing ioctls translations!"
 
 	kernel_universal_unpack
 }