Attachment 672366 Details for Bug 880322 – patch

[patch] patch

0001-Upgraded-to-version-1.7.patch (text/plain), 8.42 KB, created by Michal Srb on 2013-01-04 11:22:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2013-01-04 11:22:44 UTC

Size: 8.42 KB

patch

obsolete

>From 820c33bc0332d8e3a8173d019a1dd5e544a4a320 Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Fri, 4 Jan 2013 12:14:48 +0100
>Subject: [PATCH] Upgraded to version 1.7
>
>- Fixed URL (Resolves: #880322)
>- Removed LICENSE file from sources (source tarball now includes license text)
>---
> 0001-Improve-randomness-of-PBECipher-salt.patch    | 89 ----------------------
> ...us-cipher-migration-to-component-metadata.patch | 18 -----
> plexus-cipher.spec                                 | 49 +++++++-----
> sources                                            |  3 +-
> 4 files changed, 32 insertions(+), 127 deletions(-)
> delete mode 100644 0001-Improve-randomness-of-PBECipher-salt.patch
> delete mode 100644 plexus-cipher-migration-to-component-metadata.patch
>
>diff --git a/0001-Improve-randomness-of-PBECipher-salt.patch b/0001-Improve-randomness-of-PBECipher-salt.patch
>deleted file mode 100644
>index b08bd2a..0000000
>--- a/0001-Improve-randomness-of-PBECipher-salt.patch
>+++ /dev/null
>@@ -1,89 +0,0 @@
>-From f9975b549fcb2453b1127ceccfd1f8061e35a618 Mon Sep 17 00:00:00 2001
>-From: Mikolaj Izdebski <mizdebsk@redhat.com>
>-Date: Tue, 27 Nov 2012 15:32:10 +0100
>-Subject: [PATCH] Improve randomness of PBECipher salt
>-
>-See: https://bugzilla.redhat.com/show_bug.cgi?id=880279
>----
>- .../plexus/components/cipher/PBECipher.java        | 43 +++-------------------
>- 1 file changed, 5 insertions(+), 38 deletions(-)
>-
>-diff --git a/src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java b/src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java
>-index ce6b173..c69e753 100644
>---- a/src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java
>-+++ b/src/main/java/org/sonatype/plexus/components/cipher/PBECipher.java
>-@@ -63,9 +63,8 @@ public class PBECipher
>- 
>-     protected MessageDigest _digester;
>-     
>--    protected SecureRandom _secureRandom;
>--    
>--    protected boolean _onLinux = false;
>-+    private static final SecureRandom _secureRandom = new SecureRandom();
>-+
>-     //---------------------------------------------------------------
>-     public PBECipher()
>-     throws PlexusCipherException
>-@@ -73,21 +72,6 @@ public class PBECipher
>-         try
>-         {
>-             _digester = MessageDigest.getInstance( DIGEST_ALG );
>--            
>--            if( System.getProperty( "os.name", "blah" ).toLowerCase().indexOf( "linux" ) != -1 )
>--            {
>--                _onLinux = true;
>--            }
>--            
>--            if( _onLinux )
>--            {
>--                System.setProperty( "securerandom.source", "file:/dev/./urandom");
>--            }
>--            else
>--            {
>--                _secureRandom = new SecureRandom();
>--            }
>--            
>-         }
>-         catch ( NoSuchAlgorithmException e )
>-         {
>-@@ -96,21 +80,10 @@ public class PBECipher
>-     }
>-     //---------------------------------------------------------------
>-     private byte[] getSalt( final int sz )
>--    throws NoSuchAlgorithmException, NoSuchProviderException
>-     {
>--        byte [] res = null;
>--        
>--        if( _secureRandom != null )
>--        {
>--            _secureRandom.setSeed( System.currentTimeMillis() );
>--            res = _secureRandom.generateSeed( sz );
>--        }
>--        else
>--        {
>--            res = new byte[ sz ];
>--            Random r = new Random( System.currentTimeMillis() );
>--            r.nextBytes( res );
>--        }
>-+        byte[] res = new byte[ sz ];
>-+
>-+        _secureRandom.nextBytes( res );
>- 
>-         return res;
>-     }
>-@@ -124,12 +97,6 @@ public class PBECipher
>-     
>-             byte[] salt = getSalt( SALT_SIZE );
>-             
>--            // spin it :)
>--            if( _secureRandom != null )
>--            {
>--                new SecureRandom().nextBytes( salt );
>--            }
>--    
>-             Cipher cipher = createCipher( password.getBytes( STRING_ENCODING ), salt, Cipher.ENCRYPT_MODE  );
>-     
>-             byte [] encryptedBytes = cipher.doFinal( clearBytes );
>--- 
>-1.7.11.7
>-
>diff --git a/plexus-cipher-migration-to-component-metadata.patch b/plexus-cipher-migration-to-component-metadata.patch
>deleted file mode 100644
>index ecedade..0000000
>--- a/plexus-cipher-migration-to-component-metadata.patch
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-diff -Naur plexus-cipher-1.5.orig/pom.xml plexus-cipher-1.5/pom.xml
>---- plexus-cipher-1.5.orig/pom.xml	2009-09-14 13:50:04.000000000 +0200
>-+++ plexus-cipher-1.5/pom.xml	2011-07-26 18:05:06.195978918 +0200
>-@@ -25,12 +25,11 @@
>-     <plugins>
>-       <plugin>
>-         <groupId>org.codehaus.plexus</groupId>
>--        <artifactId>plexus-maven-plugin</artifactId>
>--        <version>1.3.5</version>
>-+        <artifactId>plexus-component-metadata</artifactId>
>-         <executions>
>-           <execution>
>-             <goals>
>--              <goal>descriptor</goal>
>-+              <goal>generate-metadata</goal>
>-             </goals>
>-           </execution>
>-         </executions>
>diff --git a/plexus-cipher.spec b/plexus-cipher.spec
>index 985de38..a9c84d4 100644
>--- a/plexus-cipher.spec
>+++ b/plexus-cipher.spec
>@@ -1,18 +1,17 @@
> Name:           plexus-cipher
>-Version:        1.5
>-Release:        11%{?dist}
>+Version:        1.7
>+Release:        1%{?dist}
> Summary:        Plexus Cipher: encryption/decryption Component
> 
> Group:          Development/Libraries
> License:        ASL 2.0
>-URL:            http://spice.sonatype.org
>-#svn export http://svn.sonatype.org/spice/tags/plexus-cipher-1.5
>-#tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
>+# project moved to GitHub and it looks like there is no official website anymore
>+URL:            https://github.com/sonatype/plexus-cipher
>+# git clone https://github.com/sonatype/plexus-cipher.git
>+# cd plexus-cipher/
>+# note this is version 1.7 + our patches which were incorporated by upstream maintainer
>+# git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz
> Source0:        %{name}-%{version}.tar.gz
>-Source1:        http://apache.org/licenses/LICENSE-2.0.txt
>-
>-Patch0:         %{name}-migration-to-component-metadata.patch
>-Patch1:         0001-Improve-randomness-of-PBECipher-salt.patch
> 
> BuildArch: noarch
> 
>@@ -27,17 +26,22 @@ BuildRequires: maven-resources-plugin
> BuildRequires: maven-surefire-plugin
> BuildRequires: maven-surefire-provider-junit
> BuildRequires: maven-doxia-sitetools
>-BuildRequires: plexus-container-default
> BuildRequires: forge-parent
> BuildRequires: spice-parent
>-BuildRequires: plexus-containers-component-metadata
> BuildRequires: junit
> BuildRequires: maven-shared-reporting-impl
>-BuildRequires: plexus-digest
>+BuildRequires: sisu
>+BuildRequires: sisu-maven-plugin
>+BuildRequires: cdi-api
>+BuildRequires: sonatype-plugins-parent
>+BuildRequires: weld-parent
>+BuildRequires: geronimo-parent-poms
> 
>-Requires: plexus-containers
> Requires: jpackage-utils
> Requires: java
>+Requires: sisu
>+Requires: sisu-maven-plugin
>+Requires: cdi-api
> 
> 
> %description
>@@ -55,10 +59,14 @@ API documentation for %{name}.
> %prep
> %setup -q
> 
>-%patch0 -p1
>-%patch1 -p1
>+# Replace version 1.8-SNAPSHOT with 1.7 in POM file
>+%pom_xpath_remove pom:project/pom:version pom.xml
>+%pom_xpath_inject pom:project "<version>1.7</version>" pom.xml
> 
>-cp %{SOURCE1} .
>+# This project requires sisu-inject-bean v2.2, but we have v2.3. Our version
>+# of the sisu-inject-bean doesn't provide javax.enterprise.inject API which is
>+# required by plexus-cipher.
>+%pom_add_dep javax.enterprise:cdi-api pom.xml
> 
> %build
> mvn-rpmbuild -Dmaven.test.failure.ignore=true \
>@@ -78,16 +86,21 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
> %add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
> 
> %files
>-%doc LICENSE-2.0.txt NOTICE.txt
>+%doc LICENSE.txt NOTICE.txt
> %{_javadir}/plexus/*
> %{_mavenpomdir}/*
> %{_mavendepmapfragdir}/*
> 
> %files javadoc
>-%doc LICENSE-2.0.txt NOTICE.txt
>+%doc LICENSE.txt NOTICE.txt
> %{_javadocdir}/plexus/%{name}
> 
> %changelog
>+* Thu Jan 03 2013 Michal Srb <msrb@redhat.com> - 1.7-1
>+- Upgraded to version 1.7
>+- Fixed URL (Resolves: #880322)
>+- Removed LICENSE file from sources (source tarball now includes license text)
>+
> * Tue Nov 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-11
> - Improve randomness of PBECipher
> - Resolves: rhbz#880279
>diff --git a/sources b/sources
>index d120e6c..d4c74d1 100644
>--- a/sources
>+++ b/sources
>@@ -1,2 +1 @@
>-4c61273327f3b8cb02a5ae9ea1e491dc  plexus-cipher-1.5.tar.gz
>-3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
>+f6a97569d5a64a8f9f5deb8b4841692a  plexus-cipher-1.7.tar.gz
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 880322: 671491 | 672366