The following commit has been merged in the master branch:
commit b2883c10b44477fa52109789da443abd74e96507
Author: James Page <james.p...@ubuntu.com>
Date: Sat Feb 23 20:56:45 2013 +0000
- d/control: Versioned BD stapler >= 1.198.
- d/maven.ignoreRules: Ignore new slave-launcher modules until
packaged.
CVE-2013-0327, CVE-2013-0328, CVE-2013-0329, CVE-2013-0330,
CVE-2013-0331
* d/control: Add net-tools and procps dependencies to jenkins
(Closes: #698835).
diff --git a/debian/changelog b/debian/changelog
index 1fbbd4f..68d3997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,17 @@ jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
* New upstream release (Closes: #700761):
- d/control: Versioned BD jenkins-remoting >= 2.22.
- d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
+ - d/control: Versioned BD stapler >= 1.198.
+ - d/maven.ignoreRules: Ignore new slave-launcher modules until
+ packaged.
- Refreshed patches.
- Fixes the following security vulnerabilities:
- CVE-XXXX-YYYY, ...
+ CVE-2013-0327, CVE-2013-0328, CVE-2013-0329, CVE-2013-0330,
+ CVE-2013-0331
* d/control: Versioned BD trilead-putty-extension (>= 1.2)
(Closes: #698834).
+ * d/control: Add net-tools and procps dependencies to jenkins
+ (Closes: #698835).
-- James Page <james.p...@ubuntu.com> Sun, 17 Feb 2013 17:11:13 +0000
diff --git a/debian/control b/debian/control
index b22eafa..216e86d 100644
--- a/debian/control
+++ b/debian/control
@@ -48,11 +48,11 @@ Build-Depends-Indep:
libjaxen-java,
libjbcrypt-java (>= 0.3-4~),
libjellydoc-java,
- libjenkins-plugin-parent-java,
libjenkins-commons-jelly-java,
libjenkins-commons-jexl-java (>= 1.1-jenkins-20111212),
libjenkins-htmlunit-java,
libjenkins-json-java (>= 2.1-rev7),
+ libjenkins-plugin-parent-java,
libjenkins-remoting-java (>= 2.22),
libjenkins-trilead-ssh2-java (>= 214-jenkins-1),
libjenkins-winstone-java (>= 0.9.10-jenkins-42),
@@ -83,16 +83,16 @@ Build-Depends-Indep:
libowasp-java-html-sanitizer-java,
libpam4j-java,
librobust-http-client-java,
- libsisu-guice-java,
libservlet2.5-java,
libsezpoz-java,
+ libsisu-guice-java,
libspring-aop-java,
libspring-core-java,
libspring-ldap-java,
libspring-web-java,
libstapler-adjunct-codemirror-java,
libstapler-adjunct-timeline-java,
- libstapler-java (>= 1.189),
+ libstapler-java (>= 1.198),
libtrilead-putty-extension-java (>= 1.2),
libtxw2-java,
libxpp3-java,
@@ -195,6 +195,8 @@ Depends:
adduser,
default-jre-headless | java6-runtime-headless,
jenkins-common,
+ net-tools,
+ procps,
${jenkins-daemon-deps},
${misc:Depends}
Conflicts: jenkins-tomcat, tomcat6
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 013cda6..7128787 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -82,3 +82,9 @@ org.jenkins-ci.modules sshd * * * *
# New stuff for 1.466.1
org.kohsuke.stapler stapler-adjunct-zeroclipboard * * * *
org.kohsuke windows-package-checker * * * *
+# TODO: These need to be packaged - but later!
+org.jenkins-ci.modules slave-installer * * * *
+org.jenkins-ci.modules windows-slave-installer * * * *
+org.jenkins-ci.modules upstart-slave-installer * * * *
+org.jenkins-ci.modules launchd-slave-installer * * * *
+
diff --git a/debian/maven.rules b/debian/maven.rules
index 23d9da5..6f9452f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,7 +21,7 @@ commons-collections commons-collections jar s/3\..*/3.x/ * *
commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
junit s/junit-dep/junit/ * s/.*/4.x/ * *
# Map onto exact version during build process
-org.jenkins-ci.main * * s/1\..*/1.480.2/ * *
+org.jenkins-ci.main * * s/1\..*/1.480.3/ * *
# Handle plugin package
org.kohsuke access-modifier-annotation jar s/.*/1.0/ * *
org.kohsuke access-modifier-checker * s/.*/1.0/ * *
@@ -67,3 +67,5 @@ s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer *
s/.*/debian/ * *
# Updates for 1.446.1
# FIXME: resolve once libpam4j has been upgraded.
s/org.kohsuke/org.jvnet.libpam4j/ libpam4j * s/.*/debian/ * *
+# Updates for 1.480.3
+org.springframework s/spring-webmvc/spring-web/ * s/.*/3.x/ * *
--
jenkins packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
