From ba957335e819d09c2285ca7fbe0b43a557e87f34 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 20 May 2012 16:35:34 +0200 Subject: [PATCH] bump and redigest --- dev-java/jss/ChangeLog | 98 +++++++++++++++++++ dev-java/jss/Manifest | 7 ++ .../jss/files/jss-3.4-target_source.patch | 12 +++ .../jss/files/jss-4.2.5-use_pkg-config.patch | 25 +++++ dev-java/jss/files/jss-4.3-ldflags.patch | 14 +++ dev-java/jss/jss-4.3.ebuild | 72 ++++++++++++++ dev-java/jss/metadata.xml | 14 +++ sys-kernel/go-sources/go-sources-3.3.1.ebuild | 47 +++++++++ 8 files changed, 289 insertions(+) create mode 100644 dev-java/jss/ChangeLog create mode 100644 dev-java/jss/Manifest create mode 100644 dev-java/jss/files/jss-3.4-target_source.patch create mode 100644 dev-java/jss/files/jss-4.2.5-use_pkg-config.patch create mode 100644 dev-java/jss/files/jss-4.3-ldflags.patch create mode 100644 dev-java/jss/jss-4.3.ebuild create mode 100644 dev-java/jss/metadata.xml create mode 100644 sys-kernel/go-sources/go-sources-3.3.1.ebuild diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog new file mode 100644 index 00000000..f5fd8c21 --- /dev/null +++ b/dev-java/jss/ChangeLog @@ -0,0 +1,98 @@ +# ChangeLog for dev-java/jss +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.24 2010/08/04 09:11:57 xarthisius Exp $ + + 04 Aug 2010; Kacper Kowalik jss-4.3.ebuild, + +files/jss-4.3-ldflags.patch: + Respect LDFLAGS wrt bug 327619. Thanks to Andreis Vinogradovs (slepnoga) + for the report. + + 07 Dec 2009; Markus Meier jss-4.3.ebuild: + amd64/x86 stable, bug #295590 + +*jss-4.3 (03 Nov 2009) + + 03 Nov 2009; Vlastimil Babka -jss-3.4-r1.ebuild, + -jss-4.2.ebuild, -files/jss-4.2-pkg-config.patch, +jss-4.3.ebuild: + Version bump, bug #290890. Remove old. + + 28 May 2008; Markus Meier jss-4.2.5.ebuild: + amd64/x86 stable, bug #223573 + + 11 May 2008; Markus Meier jss-4.2.ebuild: + amd64 stable, bug #214780 + +*jss-4.2.5 (04 May 2008) + + 04 May 2008; Petteri Räty + +files/jss-4.2.5-use_pkg-config.patch, +jss-4.2.5.ebuild: + Version bump. Fixes bug #189443. Thanks to Mario Fetka . + + 28 Mar 2008; Christian Faulhammer jss-4.2.ebuild: + stable x86, bug 214780 + + 08 Feb 2008; William L. Thomson Jr. jss-3.4-r1.ebuild: + Quoted vars + + 08 Feb 2008; William L. Thomson Jr. jss-4.2.ebuild: + Added fix for amd64 thanks to Gergan Penkov, added back ~amd64 keyword per + bug #164736 + + 25 May 2007; Petteri Räty jss-3.4-r1.ebuild: + Add pkg_setup that calls both linux-info_pkg_setup and java-pkg-2_pkg_setup + for bug #179788. + + 02 Apr 2007; Petteri Räty -jss-3.4.ebuild, + jss-3.4-r1.ebuild: + Mark stable on amd64 wrt bug #167273 and remove old gen 1 ebuild. + + 20 Feb 2007; Christian Faulhammer jss-3.4-r1.ebuild: + stable x86; bug 167273 + + 16 Feb 2007; Petteri Räty jss-3.4-r1.ebuild, + jss-4.2.ebuild: + ${ROOT} should not be used in src_unpack, bug #167271. + +*jss-4.2 (31 Jan 2007) + + 31 Jan 2007; Petteri Räty + +files/jss-4.2-pkg-config.patch, metadata.xml, +jss-4.2.ebuild: + Version bump. Fixes bug #164607 and hopefully bug #164056. Dropped amd64 + keywords because I could not test if the changes work there. + + 05 Oct 2006; Gustavo Zacarias jss-3.4.ebuild: + Dropping sparc keywords, see #96229 + + 05 Oct 2006; Gustavo Zacarias jss-3.4-r1.ebuild: + Dropping sparc keywords, see #96229 + +*jss-3.4-r1 (14 Aug 2006) + + 14 Aug 2006; Krzysiek Pawlik + +files/jss-3.4-target_source.patch, +jss-3.4-r1.ebuild: + Migrated to new Java build system. + + 05 Aug 2005; Petteri Räty jss-3.4.ebuild: + the ebuild now inherits linux-info.eclass to fix bug 101427 + + 12 Jul 2005; Thomas Matthijs jss-3.4.ebuild: + fix bug 98374 + + 12 Jul 2005; Thomas Matthijs jss-3.4.ebuild: + Dep fix + + 26 Apr 2005; Gustavo Zacarias jss-3.4.ebuild: + Stable on sparc + + 23 Mar 2005; Gustavo Zacarias jss-3.4.ebuild: + Sparc workaround added, keyworded ~sparc wrt #84992 + + 04 Feb 2005; Jan Brinkmann jss-3.4.ebuild: + the ebuild now also installs libjss3.so, marked stable on x86 and amd64. + fixing #79490 + +*jss-3.4 (18 Dec 2004) + + 18 Dec 2004; Karl Trygve Kalleberg jss-3.4.ebuild: + Initial import. Ebuild submitted by the talented Jan Brinkmann + , fixes #70244. diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest new file mode 100644 index 00000000..b46c0cdb --- /dev/null +++ b/dev-java/jss/Manifest @@ -0,0 +1,7 @@ +AUX jss-3.4-target_source.patch 633 RMD160 cc76aea593fb7493b59f0ed61f70bb1a636ccbc5 SHA1 7ef2d2876808bff77ed865aaf2746933ae40afea SHA256 7785f02cb67d47198e5d6052ecaf88ec1f237585e3244ee6bac147d5a5336732 +AUX jss-4.2.5-use_pkg-config.patch 1004 RMD160 81564af0313746dd1a80bb85df88bbcf3f6d2531 SHA1 4b0e53fa28c8aa01842a939dd738615d4b253f1c SHA256 04fdb13b7435e11149485d62218aeeefc7d20544f057b3097bef46498b8aeff0 +AUX jss-4.3-ldflags.patch 370 RMD160 77cbed52012e7e9ad34aa93bbf20655e511e028f SHA1 806ae9c4a20e180b15b99c8fb0d22a2b3ece4ebf SHA256 0698a1ca15ac42c058e4f1a1e0480b2d64f28deb95de9fefc1cb4602e20a2669 +DIST jss-4.3.tar.bz2 421731 RMD160 21d07b4c931cdbdd57d98ed92a12a287991d1b5d SHA1 6ed57f0d84d9de6a2e6a5fe0150f7d4b52ed8fcd SHA256 e82cdcadd6d7acd0d5f9274134dd5a88f26d7e47e7d9d8b059ce68ca413fb54e +EBUILD jss-4.3.ebuild 2182 RMD160 b16a4f3ff301215728da0f855bb07209907a7752 SHA1 bb05039dae33a50ac387e25ea19a0e54f41b3cc0 SHA256 b1f7404c00f3df686a00a55d2be8da2425e0d89e142f06b5bd417120b1a99cdb +MISC ChangeLog 3615 RMD160 e110d6fb4b2cacb94f2d6f14d7ee5230b8f59c26 SHA1 53141edf5f30598787ebdce0a9ead3448a49c51b SHA256 5d38e48f04740c4d1fddffd7291997c92b3edbaa5f2fd13c0a545da39912f34e +MISC metadata.xml 434 RMD160 bf2f7b01b200787d7473ce84834202067366f86d SHA1 86157cdb7f1921ef19906439056d5ef4a0bc1c59 SHA256 c92168f2c1bddf51758e8fbef06d9cf84df325cef503d5d2d040de174d3c7397 diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch new file mode 100644 index 00000000..e024a0b8 --- /dev/null +++ b/dev-java/jss/files/jss-3.4-target_source.patch @@ -0,0 +1,12 @@ +diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl +--- jss-3.4-src/mozilla/security/jss/build_java.pl 2002-10-17 02:33:29.000000000 +0200 ++++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl 2006-08-15 00:53:05.000000000 +0200 +@@ -190,7 +190,7 @@ + # + if( scalar(@source_list) > 0 ) { + ensure_dir_exists($class_dir); +- print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " . ++ print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " . + "$classpath " . join(" ",@source_list)); + } + diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch new file mode 100644 index 00000000..a2c3a3e5 --- /dev/null +++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch @@ -0,0 +1,25 @@ +Submitted By: Mario Fetka (mario-fetka at gmx dot at) +Date: 2007-10-06 +Initial Package Version: 4.2.5 +Origin: me +Upstream Status: #392775 UNCONFIRMED +Description: this patch adds pkgconfig support to jss coreconf +!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!! + +diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk +--- mozilla.orig/security/coreconf/location.mk 2006-02-27 21:18:31.000000000 +0000 ++++ mozilla/security/coreconf/location.mk 2007-10-06 10:10:17.000000000 +0000 +@@ -67,6 +67,13 @@ + + GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) + ++ifdef USE_PKGCONFIG ++ NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)` ++ NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)` ++ NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)` ++ NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)` ++endif ++ + ifdef NSPR_INCLUDE_DIR + INCLUDES += -I$(NSPR_INCLUDE_DIR) + endif diff --git a/dev-java/jss/files/jss-4.3-ldflags.patch b/dev-java/jss/files/jss-4.3-ldflags.patch new file mode 100644 index 00000000..2706da13 --- /dev/null +++ b/dev-java/jss/files/jss-4.3-ldflags.patch @@ -0,0 +1,14 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=583666 +https://bugs.gentoo.org/show_bug.cgi?id=327619 + +--- security/coreconf/Linux.mk ++++ security/coreconf/Linux.mk +@@ -174,7 +174,7 @@ + ARCH = linux + + DSO_CFLAGS = -fPIC +-DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs ++DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG) -Wl,-z,defs + DSO_LDFLAGS = + LDFLAGS += $(ARCHFLAG) + diff --git a/dev-java/jss/jss-4.3.ebuild b/dev-java/jss/jss-4.3.ebuild new file mode 100644 index 00000000..7f61e6d7 --- /dev/null +++ b/dev-java/jss/jss-4.3.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3.ebuild,v 1.3 2010/08/04 09:11:57 xarthisius Exp $ + +inherit base java-pkg-2 versionator + +RTM_NAME="JSS_${PV//./_}_RTM" +DESCRIPTION="Network Security Services for Java (JSS)" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/" +# To prepare this tarball +# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \ +# -r JSS_4_3_RTM mozilla/security/coreconf +# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \ +# -r JSS_4_3_RTM mozilla/security/jss +# tar cvjf jss-4.3.tar.bz2 mozilla +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="MPL-1.1" +SLOT="3.4" +KEYWORDS="amd64 x86" +IUSE="doc examples source" + +RDEPEND=">=dev-libs/nspr-4.7 + >=dev-libs/nss-3.12" +DEPEND=">=virtual/jdk-1.4 + app-arch/zip + dev-util/pkgconfig + >=sys-apps/sed-4 + ${RDEPEND}" +RDEPEND=">=virtual/jre-1.4 + ${RDEPEND}" + +S=${WORKDIR}/mozilla + +PATCHES=( + "${FILESDIR}/${PN}-3.4-target_source.patch" + "${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch" + "${FILESDIR}/${P}-ldflags.patch" +) + +src_compile() { + export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)" + use amd64 && export USE_64=1 + cd "${S}/security/coreconf" || die + ln -sf Linux2.6.mk Linux3.0.mk + ln -sf Linux2.6.mk Linux3.1.mk + emake -j1 BUILD_OPT=1 || die "coreconf make failed" + + cd "${S}/security/jss" || die + emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr || die "jss make failed" + if use doc; then + emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs" + fi +} + +# Investigate why this fails +RESTRICT="test" + +src_test() { + BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \ + "${S}"/dist/Linux*.OBJ/ +} + +src_install() { + java-pkg_dojar dist/*.jar + # Use this instead of the one in dist because it is a symlink + # and doso handles symlinks by just symlinking to the original + java-pkg_doso ./security/${PN}/lib/*/*.so + use doc && java-pkg_dojavadoc dist/jssdoc + use source && java-pkg_dosrc ./security/jss/org + use examples && java-pkg_doexamples ./security/jss/samples +} diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml new file mode 100644 index 00000000..6b82ef40 --- /dev/null +++ b/dev-java/jss/metadata.xml @@ -0,0 +1,14 @@ + + + + +java + + + +Network Security Services for Java (JSS) is a Java interface to NSS. It supports +most of the security standards and encryption technologies supported by NSS. JSS +also provides a pure Java interface for ASN.1 types and BER/DER encoding. + + + diff --git a/sys-kernel/go-sources/go-sources-3.3.1.ebuild b/sys-kernel/go-sources/go-sources-3.3.1.ebuild new file mode 100644 index 00000000..951fbc95 --- /dev/null +++ b/sys-kernel/go-sources/go-sources-3.3.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="2" +K_DEBLOB_AVAILABLE="1" + +GOPATCHES_VER="1" +GOPATCHES="go-patches-${PV}-${GOPATCHES_VER}.tar.bz2" +GOPATCHES_URI="http://ftp.disconnected-by-peer.at/go/${GOPATCHES}" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" +HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor" + +DESCRIPTION="Full sources including the Gentoo & Geos One patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${GOPATCHES_URI}" + +UNIPATCH_LIST="${DISTDIR}/${GOPATCHES} ${DISTDIR}/${AAPATCHES}" +UNIPATCH_EXCLUDE="6012_imqmq-3.2.patch 6011_aufs3-standalone-3.2.patch" + +src_prepare() { + kernel-2_src_prepare + + find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null + sed -i "s:\$(CKVERSION)::" "${S}/Makefile" || die + +} + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + einfo + einfo "Make sure that your kernel configuration file is set with:" + einfo " CONFIG_SECURITY=y" + einfo " CONFIG_SECURITY_APPARMOR=y" + einfo "Without these, apparmor will not function." +}