msrb pushed to jenkins-pam-auth-plugin (f22). "Initial packaging"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 07:02:40 UTC 2015


>From 6b8a3d52d1429fb8c6662ab2584fe48bf642a88f Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 16 Apr 2015 09:01:03 +0200
Subject: Initial packaging


diff --git a/.gitignore b/.gitignore
index e69de29..b8f7a6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/pam-auth-1.2.tar.gz
+/LICENSE.txt
diff --git a/jenkins-pam-auth-plugin.spec b/jenkins-pam-auth-plugin.spec
new file mode 100644
index 0000000..965ef90
--- /dev/null
+++ b/jenkins-pam-auth-plugin.spec
@@ -0,0 +1,79 @@
+%global mod_name pam-auth-plugin
+%global short_name pam-auth
+%global plugin_home %{_datadir}/jenkins/webroot/WEB-INF/plugins/
+
+Name:           jenkins-%{mod_name}
+Version:        1.2
+Release:        1%{?dist}
+Summary:        Jenkins PAM Authentication plugin
+
+# License is specified in pom.xml
+License:        MIT
+URL:            https://github.com/jenkinsci/pam-auth-plugin
+Source0:        https://github.com/jenkinsci/%{mod_name}/archive/%{short_name}-%{version}.tar.gz
+# Text copied from http://www.opensource.org/licenses/mit-license.php
+Source1:        LICENSE.txt
+Patch0:         migrate-to-jnr-posix.patch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.jenkins-ci.plugins:plugin:pom:)
+BuildRequires:  mvn(org.kohsuke:access-modifier-checker)
+BuildRequires:  mvn(org.jenkins-ci.main:jenkins-core)
+BuildRequires:  mvn(org.kohsuke:libpam4j)
+Requires:       jenkins-webapp >= 1.581-3
+
+BuildArch:      noarch
+
+%description
+This package adds Unix Pluggable Authentication Module (PAM) support to
+Jenkins.
+
+
+%package        javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for 
+%{name}.
+
+%prep
+%setup -q -n %{mod_name}-%{short_name}-%{version}
+
+%patch0 -p1
+
+%pom_remove_plugin :animal-sniffer-maven-plugin
+
+cp %{SOURCE1} .
+%mvn_file ::hpi:: %{name}/%{short_name}
+
+%build
+# missing artifact for tests: "org.jenkins-ci.main:jenkins-test-harness"
+%mvn_build -f
+
+%install
+install -d -m 755 %{buildroot}/%{plugin_home}
+unzip -d target/%{short_name}.hpi-unpacked target/%{short_name}.hpi
+pushd target/%{short_name}.hpi-unpacked/WEB-INF/lib/
+  rm %{short_name}.jar && ln -s %{_javadir}/%{name}/%{short_name}.jar .
+  xmvn-subst -s .
+popd
+pushd target/%{short_name}.hpi-unpacked/
+  zip -y -r %{short_name}.hpi .
+popd
+mv target/%{short_name}.hpi-unpacked/%{short_name}.hpi target/
+cp target/%{short_name}.hpi %{buildroot}/%{plugin_home}/
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%dir %{_mavenpomdir}/%{name}
+%{plugin_home}
+%doc LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
+
+%changelog
+* Mon Oct 20 2014 Michal Srb <msrb at redhat.com> - 1.2-1
+- Initial packaging
+
diff --git a/migrate-to-jnr-posix.patch b/migrate-to-jnr-posix.patch
new file mode 100644
index 0000000..4d127cb
--- /dev/null
+++ b/migrate-to-jnr-posix.patch
@@ -0,0 +1,28 @@
+diff --git a/src/main/java/hudson/security/PAMSecurityRealm.java b/src/main/java/hudson/security/PAMSecurityRealm.java
+index 8c837bd..344edc5 100644
+--- a/src/main/java/hudson/security/PAMSecurityRealm.java
++++ b/src/main/java/hudson/security/PAMSecurityRealm.java
+@@ -37,10 +37,10 @@ import org.acegisecurity.GrantedAuthorityImpl;
+ import org.acegisecurity.userdetails.User;
+ import org.acegisecurity.userdetails.UserDetails;
+ import org.acegisecurity.userdetails.UsernameNotFoundException;
+-import org.jruby.ext.posix.FileStat;
+-import org.jruby.ext.posix.Group;
+-import org.jruby.ext.posix.POSIX;
+-import org.jruby.ext.posix.Passwd;
++import jnr.posix.FileStat;
++import jnr.posix.Group;
++import jnr.posix.POSIX;
++import jnr.posix.Passwd;
+ import org.jvnet.libpam.PAM;
+ import org.jvnet.libpam.PAMException;
+ import org.jvnet.libpam.UnixUser;
+@@ -158,7 +158,7 @@ public class PAMSecurityRealm extends AbstractPasswordBasedSecurityRealm {
+             if(s.exists() && !s.canRead()) {
+                 // it looks like shadow password is in use, but we don't have read access
+                 LOGGER.fine("/etc/shadow exists but not readable");
+-                POSIX api = PosixAPI.get();
++                POSIX api = PosixAPI.jnr();
+                 FileStat st = api.stat("/etc/shadow");
+                 if(st==null)
+                     return FormValidation.error(Messages.PAMSecurityRealm_ReadPermission());
diff --git a/sources b/sources
index e69de29..cce38d4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+e91967179df71baa1a5c018ee3c5e6f8  pam-auth-1.2.tar.gz
+b28808853537299bae3b2025e2c38d89  LICENSE.txt
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jenkins-pam-auth-plugin.git/commit/?h=f22&id=6b8a3d52d1429fb8c6662ab2584fe48bf642a88f


More information about the scm-commits mailing list