From a803148160e10610284059681340648cffc7262c Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 26 Jan 2008 22:12:35 +0000 Subject: [PATCH] net-fs/novell-novfs: Correct patch --- .../net-fs/novell-novfs/ChangeLog | 4 + .../net-fs/novell-novfs/Manifest | 23 ++++-- .../files/digest-novell-novfs-2.0.0_p23-r2 | 3 + .../files/novell-novfs-2.0.0-vfs.patch | 2 +- .../novell-novfs-2.0.0_p23-r2.ebuild | 73 +++++++++++++++++++ 5 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 trunk/novell4gentoo/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p23-r2 create mode 100644 trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0_p23-r2.ebuild diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog index caaebef0..177228bb 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog +++ b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jan 2008; Mario Fetka + files/novell-novfs-2.0.0-vfs.patch, +novell-novfs-2.0.0_p23-r2.ebuild: + Correct patch + 26 Jan 2008; Mario Fetka files/novell-novfs-2.0.0-vfs.patch: Correct patch diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest index 203454d8..ddd22a12 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest +++ b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest @@ -50,10 +50,10 @@ AUX novell-novfs-2.0.0-u.generic_ip.patch 24168 RMD160 37046de7e80c853327f2865f4 MD5 95fe1b20b61bda4152c6140ef7b07241 files/novell-novfs-2.0.0-u.generic_ip.patch 24168 RMD160 37046de7e80c853327f2865f45f05458970feea9 files/novell-novfs-2.0.0-u.generic_ip.patch 24168 SHA256 950b959d82a21902ac0579bbb8721fc22a0813bd4ed5e0bf1ee835b1ad8dfbca files/novell-novfs-2.0.0-u.generic_ip.patch 24168 -AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 bee2fa1ab301c6fed956da677c0d573e44c34688 SHA1 1ee4b9831c2d4ed060b86e0a88b32be5c68586f4 SHA256 eae2a7f7cff8d8a5d36a8d45ed0ae4c146a91b4caf5ef109b577cfaf0a5d5982 -MD5 2b1a4d70dd52bf16b6a6d8c8e606ab41 files/novell-novfs-2.0.0-vfs.patch 524 -RMD160 bee2fa1ab301c6fed956da677c0d573e44c34688 files/novell-novfs-2.0.0-vfs.patch 524 -SHA256 eae2a7f7cff8d8a5d36a8d45ed0ae4c146a91b4caf5ef109b577cfaf0a5d5982 files/novell-novfs-2.0.0-vfs.patch 524 +AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 caab5f55b21e0a84c90529af01018f076069e046 SHA1 e4ff839c81ea455975104f096c81a3f7e2564867 SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee +MD5 3e4d80662503382a5c234d39d701b72f files/novell-novfs-2.0.0-vfs.patch 524 +RMD160 caab5f55b21e0a84c90529af01018f076069e046 files/novell-novfs-2.0.0-vfs.patch 524 +SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee files/novell-novfs-2.0.0-vfs.patch 524 AUX novell-novfs-2.0.0_p16-vfs.patch 524 RMD160 f80558761c3a2cff1ac4709ecc41fae4ebb8b83a SHA1 6d3654efb7620f34ef9d27e37a14529d6b24a269 SHA256 4aa2195da32e91d20d6a64282ad22cce9f3601622be2b35c15580756ad1e738b MD5 375c66859993a01086e33561bcfcef92 files/novell-novfs-2.0.0_p16-vfs.patch 524 RMD160 f80558761c3a2cff1ac4709ecc41fae4ebb8b83a files/novell-novfs-2.0.0_p16-vfs.patch 524 @@ -100,14 +100,18 @@ EBUILD novell-novfs-2.0.0_p23-r1.ebuild 1684 RMD160 68eae5c17878d7a6afbd70aa518a MD5 ae458c06838a249a0cf8c69952953953 novell-novfs-2.0.0_p23-r1.ebuild 1684 RMD160 68eae5c17878d7a6afbd70aa518aa23b7e705a59 novell-novfs-2.0.0_p23-r1.ebuild 1684 SHA256 bc435ad3c2c3319e934c5898e39c2d0cb9d1e9e10c37a8b68969184291244f4a novell-novfs-2.0.0_p23-r1.ebuild 1684 +EBUILD novell-novfs-2.0.0_p23-r2.ebuild 1684 RMD160 68eae5c17878d7a6afbd70aa518aa23b7e705a59 SHA1 e131648245a9f61cb56b58b1ca1d3ac63fecd514 SHA256 bc435ad3c2c3319e934c5898e39c2d0cb9d1e9e10c37a8b68969184291244f4a +MD5 ae458c06838a249a0cf8c69952953953 novell-novfs-2.0.0_p23-r2.ebuild 1684 +RMD160 68eae5c17878d7a6afbd70aa518aa23b7e705a59 novell-novfs-2.0.0_p23-r2.ebuild 1684 +SHA256 bc435ad3c2c3319e934c5898e39c2d0cb9d1e9e10c37a8b68969184291244f4a novell-novfs-2.0.0_p23-r2.ebuild 1684 EBUILD novell-novfs-2.0.0_p23.ebuild 1684 RMD160 944a9e110178af87b7832f6675f65a2a257792a9 SHA1 1c91171d647799bdb41ce14dacd91c8cc613dbd0 SHA256 3e1625404da5c99493fa4e2702ad7ccbf1e718aaa8638ccfa1255f07f379f5cb MD5 549de538b6cd21a142c1f1c4d6850295 novell-novfs-2.0.0_p23.ebuild 1684 RMD160 944a9e110178af87b7832f6675f65a2a257792a9 novell-novfs-2.0.0_p23.ebuild 1684 SHA256 3e1625404da5c99493fa4e2702ad7ccbf1e718aaa8638ccfa1255f07f379f5cb novell-novfs-2.0.0_p23.ebuild 1684 -MISC ChangeLog 3206 RMD160 21cf4c85f6927b56371e8877c2782786ca100283 SHA1 e9b79e6fcdf11685639cf0756907e225512af724 SHA256 81d15ab2f60df55b3cb029c74b41c9e6969d1e10283a9a48efadc7ffab36ab9c -MD5 8f3c047dbb52dbc8058cc31f1e5f53a0 ChangeLog 3206 -RMD160 21cf4c85f6927b56371e8877c2782786ca100283 ChangeLog 3206 -SHA256 81d15ab2f60df55b3cb029c74b41c9e6969d1e10283a9a48efadc7ffab36ab9c ChangeLog 3206 +MISC ChangeLog 3344 RMD160 502263b6a336e1a2ac9f2c40b1dfbfd3809d0d7a SHA1 aede947eb2661e57b643bd46bff5c0640cdce3f5 SHA256 3680066b021134af5e1ce7c7f0c79fe1b948dfe2e8749defe9c2b4dd0b9f4bd3 +MD5 df93a694e6ea5e520c9a03a5c275a62d ChangeLog 3344 +RMD160 502263b6a336e1a2ac9f2c40b1dfbfd3809d0d7a ChangeLog 3344 +SHA256 3680066b021134af5e1ce7c7f0c79fe1b948dfe2e8749defe9c2b4dd0b9f4bd3 ChangeLog 3344 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -139,3 +143,6 @@ SHA256 d30f90e6742bf18ada297495ef702f3f18b4648a55a1ecc73a31c3a5a7d7648c files/di MD5 e8b7312e808e27084790108e845e0c21 files/digest-novell-novfs-2.0.0_p23-r1 247 RMD160 744d3703c6bc402e76b9bdba60a9b5477868c098 files/digest-novell-novfs-2.0.0_p23-r1 247 SHA256 d30f90e6742bf18ada297495ef702f3f18b4648a55a1ecc73a31c3a5a7d7648c files/digest-novell-novfs-2.0.0_p23-r1 247 +MD5 e8b7312e808e27084790108e845e0c21 files/digest-novell-novfs-2.0.0_p23-r2 247 +RMD160 744d3703c6bc402e76b9bdba60a9b5477868c098 files/digest-novell-novfs-2.0.0_p23-r2 247 +SHA256 d30f90e6742bf18ada297495ef702f3f18b4648a55a1ecc73a31c3a5a7d7648c files/digest-novell-novfs-2.0.0_p23-r2 247 diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p23-r2 b/trunk/novell4gentoo/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p23-r2 new file mode 100644 index 00000000..692500e9 --- /dev/null +++ b/trunk/novell4gentoo/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p23-r2 @@ -0,0 +1,3 @@ +MD5 810252c8ca7eafbc31fe2a461ba6b19f novfs-2.0.0-23.src.rpm 133355 +RMD160 67a07d2eb8b12cefe40d44dab9c94670c64cc54d novfs-2.0.0-23.src.rpm 133355 +SHA256 e5e4c234a39220b8f86c6bc45d446abe0ec20b46d6b72792541ad5e3bc3ebbeb novfs-2.0.0-23.src.rpm 133355 diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/files/novell-novfs-2.0.0-vfs.patch b/trunk/novell4gentoo/net-fs/novell-novfs/files/novell-novfs-2.0.0-vfs.patch index 7950a296..6ab8523e 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/files/novell-novfs-2.0.0-vfs.patch +++ b/trunk/novell4gentoo/net-fs/novell-novfs/files/novell-novfs-2.0.0-vfs.patch @@ -5,7 +5,7 @@ atomic_inc(&inode->i_count); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) // Version of 2.6.20 changed the number of // parameters passed to vfs_unlink. error = vfs_unlink(nd.dentry->d_inode, dentry, nd.mnt); diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0_p23-r2.ebuild b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0_p23-r2.ebuild new file mode 100644 index 00000000..44b44c6f --- /dev/null +++ b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0_p23-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils rpm linux-mod + +MY_PV="${PV/_p/-}" + +DESCRIPTION="Novell Client for Linux Filesystem" +HOMEPAGE="http://www.novell.com" +SRC_URI="ftp://mars.arge.at/n4g/novfs-${MY_PV}.src.rpm + http://ftp.mars.arge.at/n4g/novfs-${MY_PV}.src.rpm + http://download.opensuse.org/distribution/SL-OSS-factory/inst-source/suse/src/novfs-${MY_PV}.src.rpm" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" + +DEPEND="" + +RDEPEND="virtual/linux-sources + !net-misc/novell-novfs" + +RESTRICT="nomirror" + +#BUILD_PARAMS="-C $KERNEL_DIR SUBDIRS=-${WORKDIR}/novfs-2.0.0/src" +MODULE_NAMES="novfs(novfs:${WORKDIR}/novfs-2.0.0/src:${WORKDIR}/novfs-2.0.0/src" +BUILD_TARGETS="all" +MODULESD_NOVFS_ENABLED="" + +src_unpack() { + rpm_src_unpack ${A} + epatch ${FILESDIR}/novell-novfs-2.0.0-vfs.patch + epatch ${FILESDIR}/novell-novfs-2.0.0-section_mismatch-1.patch + +# if kernel_is eq 2 6 15 +# then +# epatch ${FILESDIR}/novell-novfs-2.0.0-2_6_15-compat.patch +# fi +# if kernel_is ge 2 6 17 +# then +# epatch ${FILESDIR}/novell-novfs-2.0.0-config_h.patch +# fi +# if kernel_is ge 2 6 18 +# then +# epatch ${FILESDIR}/novell-novfs-2.0.0-generic_file_read.patch +# fi +# if kernel_is ge 2 6 19 +# then +# epatch ${FILESDIR}/novell-novfs-2.0.0-i_blksize.patch +# epatch ${FILESDIR}/novell-novfs-2.0.0-u.generic_ip.patch +# fi + +# epatch ${FILESDIR}/novell-novfs-2.0.0-dont_use_tasklist_lock.patch +} + +src_compile() { + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + generate_modulesd +} + +pkg_postinst() { + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm +}