[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch:
commit b2883c10b44477fa52109789da443abd74e96507
Author: James Page
Date: Sat Feb 23 20:56:45 2013 +
- 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--, ...
+ 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 Sun, 17 Feb 2013 17:11:13 +
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
[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch:
commit 752173cb12e9a2b868d71cec4369c734ca9637e6
Author: James Page
Date: Sun Feb 24 21:45:14 2013 +
* d/rules,control, *.upstart.in: Rejig upstart/init configurations now
that debhelper does the right thing across Debian/Ubuntu.
* d/rules,plugin_parent.pom.in: Drop as good plugin parent pom now
provided upstream.
diff --git a/debian/changelog b/debian/changelog
index 68d3997..3ff8637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
(Closes: #698834).
* d/control: Add net-tools and procps dependencies to jenkins
(Closes: #698835).
+ * d/rules,control, *.upstart.in: Rejig upstart/init configurations now
+that debhelper does the right thing across Debian/Ubuntu.
+ * d/rules,plugin_parent.pom.in: Drop as good plugin parent pom now
+provided upstream.
-- James Page Sun, 17 Feb 2013 17:11:13 +
diff --git a/debian/control b/debian/control
index 216e86d..8bcdfbf 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,7 @@ Description: Jenkins Plugin Parent Maven POM
Package: jenkins-common
Architecture: all
Depends:
- libjenkins-remoting-java,
+ libjenkins-remoting-java (>= 2.22),
libjffi-java,
libjna-java,
libjnr-posix-java,
@@ -197,7 +197,7 @@ Depends:
jenkins-common,
net-tools,
procps,
- ${jenkins-daemon-deps},
+ psmisc,
${misc:Depends}
Conflicts: jenkins-tomcat, tomcat6
Description: Continuous Integration and Job Scheduling Server
@@ -226,7 +226,6 @@ Architecture: all
Depends:
adduser,
default-jre-headless | java6-runtime-headless,
- ${jenkins-daemon-deps},
${misc:Depends}
Recommends: jenkins-cli, ssh-server | openssh-server
Description: Jenkins slave node helper
@@ -261,7 +260,7 @@ Depends:
default-jre-headless | java6-runtime-headless,
libcommons-io-java,
libcommons-lang-java,
- libjenkins-remoting-java,
+ libjenkins-remoting-java (>= 2.22),
libjenkins-xstream-java,
libjffi-java,
libjnr-posix-java,
diff --git a/debian/debian_control_vars b/debian/debian_control_vars
deleted file mode 100644
index 0c8ffb4..000
--- a/debian/debian_control_vars
+++ /dev/null
@@ -1 +0,0 @@
-jenkins-daemon-deps= daemon, psmisc
diff --git a/debian/jenkins-slave.upstart.in b/debian/jenkins-slave.upstart
similarity index 100%
rename from debian/jenkins-slave.upstart.in
rename to debian/jenkins-slave.upstart
diff --git a/debian/jenkins.upstart.in b/debian/jenkins.upstart
similarity index 100%
rename from debian/jenkins.upstart.in
rename to debian/jenkins.upstart
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index d3b9f34..45b4ce5 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -27,4 +27,4 @@ pom.xml --has-package-version --no-parent
core/pom.xml --has-package-version --ignore-pom
war/pom.xml --has-package-version --ignore-pom
cli/pom.xml --has-package-version --ignore-pom
-plugins/pom.xml --has-package-version --ignore-pom --no-parent
+plugins/pom.xml --has-package-version --ignore-pom --no-parent
--package=libjenkins-plugin-parent-java
diff --git a/debian/plugin-debian.pom.in b/debian/plugin-debian.pom.in
deleted file mode 100644
index 49f6c3c..000
--- a/debian/plugin-debian.pom.in
+++ /dev/null
@@ -1,107 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- 4.0.0
-
- org.jenkins-ci.plugins
- plugin
- Jenkins plugin POM
- debian
- pom
-
-
-
- org.jenkins-ci.main
- jenkins-core
- __VERSION__
- provided
-
-
- junit
- junit
- 4.x
- test
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
-
-
-${project.artifactId}
-package
-
-
-
- org.kohsuke
- access-modifier-checker
- 1.0
-
-
-
-
-
-org.jenkins-ci.tools
-maven-hpi-plugin
-1.79
-true
-
- true
-
-
-
-org.kohsuke.stapler
-maven-stapler-plugin
-1.16
-true
-
-
-org.jvnet.localizer
-maven-localizer-plugin
-1.13
-
-
-
- generate
-
-
- Messages.properties
-
target/generated-sources/localizer
-
-
-
-
-
-maven-javadoc-plugin
-
-
-maven-compiler-plugin
-
- 1.5
- 1.5
-
-
-
-maven-surefire-plugin
-
-
-
- hudson.udp
- 33849
-
-
-
-
-
-
-
-
diff --git a/debian/rules b/debian/rules
index a05436a..e586ac9 100755
--- a/de
[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch:
commit 8ce69b58fcc4d1bb74901dc549643ff52a76834b
Author: James Page
Date: Sun Feb 24 22:16:48 2013 +
Re-instate control var processing for Debian
diff --git a/debian/changelog b/debian/changelog
index 3ff8637..36a3dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
- * New upstream release (Closes: #700761):
+ * New upstream release (Closes: #700761, #679616):
- 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.
diff --git a/debian/control b/debian/control
index 8bcdfbf..27638bb 100644
--- a/debian/control
+++ b/debian/control
@@ -195,9 +195,7 @@ Depends:
adduser,
default-jre-headless | java6-runtime-headless,
jenkins-common,
- net-tools,
- procps,
- psmisc,
+ ${jenkins-daemon-deps},
${misc:Depends}
Conflicts: jenkins-tomcat, tomcat6
Description: Continuous Integration and Job Scheduling Server
@@ -226,6 +224,7 @@ Architecture: all
Depends:
adduser,
default-jre-headless | java6-runtime-headless,
+ ${jenkins-daemon-deps},
${misc:Depends}
Recommends: jenkins-cli, ssh-server | openssh-server
Description: Jenkins slave node helper
diff --git a/debian/debian_control_vars b/debian/debian_control_vars
new file mode 100644
index 000..f718e44
--- /dev/null
+++ b/debian/debian_control_vars
@@ -0,0 +1 @@
+jenkins-daemon-deps= daemon, psmisc, net-tools, procps, psmisc
diff --git a/debian/rules b/debian/rules
index e586ac9..6f97f63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,12 @@ DEB_MAVEN_BUILD_TARGET := install
DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
DEB_MAVEN_INSTALL_TO_USJ := false
+# Debian package version use daemon to control jenkins processes
+# Ubuntu does not need this - managed by upstart
+ifeq ($(shell dpkg-vendor --derives-from ubuntu || echo debian ),debian)
+DEB_DH_GENCONTROL_ARGS:= -- -Tdebian/debian_control_vars
+endif
+
# Sort out MANIFEST.MF entries in jenkins cli .jar files
# and create handy links for script wrapper
binary-post-install/jenkins-cli::
--
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
[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch: commit 776c98d2a25cc82769e47dbc6ac34ad4a1b0fca7 Author: James Page Date: Sun Feb 24 22:17:54 2013 + Release to experimental diff --git a/debian/changelog b/debian/changelog index 36a3dff..f33957a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low +jenkins (1.480.3+dfsg-1~exp1) experimental; urgency=low * New upstream release (Closes: #700761, #679616): - d/control: Versioned BD jenkins-remoting >= 2.22. -- 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
[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch:
commit e56d83654873c966c872daedc9d50ab0df898269
Author: James Page
Date: Sun Feb 17 18:05:53 2013 +
New upstream release (Closes: #700761):
* New upstream release (Closes: #700761):
- d/control: Versioned BD jenkins-remoting >= 2.22.
- d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
- Refreshed patches.
- Fixes the following security vulnerabilities:
CVE--, ...
* d/control: Versioned BD trilead-putty-extension (>= 1.2)
(Closes: #698834).
diff --git a/debian/changelog b/debian/changelog
index decc114..1fbbd4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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.
+- Refreshed patches.
+- Fixes the following security vulnerabilities:
+ CVE--, ...
+ * d/control: Versioned BD trilead-putty-extension (>= 1.2)
+(Closes: #698834).
+
+ -- James Page Sun, 17 Feb 2013 17:11:13 +
+
jenkins (1.480.2+dfsg-1~exp1) experimental; urgency=low
* New upstream release (Closes: #696816, #697617):
diff --git a/debian/control b/debian/control
index 950e546..b22eafa 100644
--- a/debian/control
+++ b/debian/control
@@ -53,9 +53,9 @@ Build-Depends-Indep:
libjenkins-commons-jexl-java (>= 1.1-jenkins-20111212),
libjenkins-htmlunit-java,
libjenkins-json-java (>= 2.1-rev7),
- libjenkins-remoting-java (>= 2.16),
+ libjenkins-remoting-java (>= 2.22),
libjenkins-trilead-ssh2-java (>= 214-jenkins-1),
- libjenkins-winstone-java (>= 0.9.10-jenkins-40),
+ libjenkins-winstone-java (>= 0.9.10-jenkins-42),
libjenkins-xstream-java,
libjetty-java,
libjffi-java,
@@ -93,7 +93,7 @@ Build-Depends-Indep:
libstapler-adjunct-codemirror-java,
libstapler-adjunct-timeline-java,
libstapler-java (>= 1.189),
- libtrilead-putty-extension-java,
+ libtrilead-putty-extension-java (>= 1.2),
libtxw2-java,
libxpp3-java,
ttf-dejavu-core
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 889880c..d3b9f34 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -27,3 +27,4 @@ pom.xml --has-package-version --no-parent
core/pom.xml --has-package-version --ignore-pom
war/pom.xml --has-package-version --ignore-pom
cli/pom.xml --has-package-version --ignore-pom
+plugins/pom.xml --has-package-version --ignore-pom --no-parent
diff --git a/debian/patches/build/apt-stapler-processing.patch
b/debian/patches/build/apt-stapler-processing.patch
index 28ca74e..52424b5 100644
--- a/debian/patches/build/apt-stapler-processing.patch
+++ b/debian/patches/build/apt-stapler-processing.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -651,6 +651,24 @@ THE SOFTWARE.
+@@ -652,6 +652,24 @@ THE SOFTWARE.
diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch
index cb00fdc..405ace2 100644
--- a/debian/patches/build/build.patch
+++ b/debian/patches/build/build.patch
@@ -13,9 +13,9 @@ Forwarded: not-needed
war
-test
cli
+ plugins
-
-@@ -580,9 +577,6 @@ THE SOFTWARE.
+@@ -581,9 +578,6 @@ THE SOFTWARE.
1.6.0-18
@@ -27,7 +27,7 @@ Forwarded: not-needed
--- a/core/pom.xml
+++ b/core/pom.xml
-@@ -325,6 +325,16 @@ THE SOFTWARE.
+@@ -326,6 +326,16 @@ THE SOFTWARE.
commons-jelly
commons-jelly-tags-fmt
1.0
diff --git a/debian/patches/build/disable-plugins.patch
b/debian/patches/build/disable-plugins.patch
index 9f9656d..d8f5aac 100644
--- a/debian/patches/build/disable-plugins.patch
+++ b/debian/patches/build/disable-plugins.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/war/pom.xml
+++ b/war/pom.xml
-@@ -154,6 +154,11 @@ THE SOFTWARE.
+@@ -174,6 +174,11 @@ THE SOFTWARE.
system
/usr/local/yjp/lib/yjp.jar
@@ -16,7 +16,7 @@ Forwarded: not-needed
-@@ -241,66 +246,6 @@ THE SOFTWARE.
+@@ -261,66 +266,6 @@ THE SOFTWARE.
${project.build.directory}/${project.build.finalName}
winstone.jar
diff --git a/debian/patches/build/openjdk6.patch
b/debian/patches/build/openjdk6.patch
index 255f195..96eddbd 100644
--- a/debian/patches/build/openjdk6.patch
+++ b/debian/patches/build/openjdk6.patch
@@ -6,7 +6,7 @@ Forwarded:
https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
-@@ -1274,6 +1274,15 @@ public abstract class AbstractBuild
diff --git a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
index 42
[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
The following commit has been merged in the master branch: commit 6d769a3be06980b40960604dfbbcda94651e28a8 Merge: d094d0ff7bca6c18c8b8f328a1c1826d07071634 cde87a61552d22b9164ac3381fe86cf334349bc3 Author: James Page Date: Sun Feb 17 17:10:42 2013 + Merge tag 'upstream/1.480.3+dfsg' Upstream version 1.480.3+dfsg -- 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
