summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 16:12:42 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 16:12:54 +0000
commit115fb1c03bad7ea10c3aa42bc71619a6179f76ca (patch)
tree204f42882244f89e7807b7c25e1332fe136d9a6b
parentMerging upstream version 4.4.3. (diff)
downloadrequest-tracker4-115fb1c03bad7ea10c3aa42bc71619a6179f76ca.zip
request-tracker4-115fb1c03bad7ea10c3aa42bc71619a6179f76ca.tar.xz
Merging debian version 4.4.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/.git-dpm16
-rw-r--r--debian/NEWS10
-rw-r--r--debian/alts2
-rw-r--r--debian/bug/script17
-rw-r--r--debian/changelog18
-rw-r--r--debian/control12
-rw-r--r--debian/patches/assettracker-sysgroups.diff4
-rw-r--r--debian/patches/debianize_UPGRADING-4.2.diff4
-rw-r--r--debian/patches/debianize_backup_docs.diff12
-rw-r--r--debian/patches/debianize_docs_local.diff8
-rw-r--r--debian/patches/debianize_version.diff10
-rw-r--r--debian/patches/fix_lintian_privacy_break_logo_error.diff4
-rw-r--r--debian/patches/fonts_use_noto_sans.diff6
-rw-r--r--debian/patches/layout.diff4
-rw-r--r--debian/patches/load_rt_generated.diff6
-rw-r--r--debian/patches/no_test_web_installer.diff4
-rw-r--r--debian/patches/no_testdeps.diff6
-rw-r--r--debian/patches/rt_setup_database_upgrade_basedir.diff4
-rw-r--r--debian/patches/rt_test_db_type.diff6
-rw-r--r--debian/patches/runtime_gpg1.diff6
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/sitemodules.diff4
-rw-r--r--debian/patches/test_gnupg-interface_gpg1.diff4
-rw-r--r--debian/patches/test_gpg1.diff6
-rw-r--r--debian/patches/test_locale.diff6
-rw-r--r--debian/patches/unescaped_left_brace.patch24
-rw-r--r--debian/patches/use_cpanel_json_xs.diff30
-rw-r--r--debian/postinst3
-rw-r--r--debian/prerm2
-rw-r--r--debian/whatis1
30 files changed, 132 insertions, 109 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1f457df..5d57013 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,9 +1,9 @@
# see git-dpm(1) from git-dpm package
-12eb8053d45063869a9ace26e8f9289691f9d390
-12eb8053d45063869a9ace26e8f9289691f9d390
-5eb64b2f5913182c083463e534ef1f7f3dc8b7d6
-5eb64b2f5913182c083463e534ef1f7f3dc8b7d6
-request-tracker4_4.4.2.orig.tar.gz
-2397bfe2aee8dc5a608786320fb2650612f13b09
-9572361
-component:8fcdf3ad013f39f611ab742becb42f0fbbce7b41:1133485:request-tracker4_4.4.2.orig-third-party-source.tar.gz
+20766b8eaa377b556aaaded81576c43058a0586e
+20766b8eaa377b556aaaded81576c43058a0586e
+cae4666079f25496de9f49e7c61583bf3b616946
+cae4666079f25496de9f49e7c61583bf3b616946
+request-tracker4_4.4.3.orig.tar.gz
+f25411cfd742eabc8ef150e3cd7d429a53cc6705
+9584927
+component:05d503c63faaf7078e55ecc0304e7d30532e0f06:1132743:request-tracker4_4.4.3.orig-third-party-source.tar.gz
diff --git a/debian/NEWS b/debian/NEWS
index b5b8d7f..e531d34 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+request-tracker4 (4.4.3-1) UNRELEASED; urgency=medium
+
+ RT now has the functionality from
+ RT::Extension::AdminConditionsAndActions built in. Users who are
+ currently using this extension should remove it from the plugin list.
+ Please also remove local/plugins/RT-Extension-AdminConditionsAndActions
+ from your RT installation.
+
+ -- Dominic Hargreaves <dom@earth.li> Sun, 09 Sep 2018 18:25:00 +0100
+
request-tracker4 (4.4.2-1) unstable; urgency=medium
This version includes changes to time worked handling. If you
diff --git a/debian/alts b/debian/alts
index 8376a3f..24a356c 100644
--- a/debian/alts
+++ b/debian/alts
@@ -17,6 +17,7 @@ usr/sbin/rt-importer
usr/sbin/rt-serializer
usr/sbin/rt-externalize-attachments
usr/sbin/rt-ldapimport
+usr/sbin/rt-passwd
usr/share/man/man1/rt-crontool!.1
usr/share/man/man8/rt-setup-database!.8
usr/share/man/man8/rt-dump-metadata!.8
@@ -36,3 +37,4 @@ usr/share/man/man8/rt-importer!.8
usr/share/man/man8/rt-serializer!.8
usr/share/man/man8/rt-externalize-attachments!.8
usr/share/man/man8/rt-ldapimport!.8
+usr/share/man/man8/rt-passwd!.8
diff --git a/debian/bug/script b/debian/bug/script
index 953e1b8..1f191d7 100644
--- a/debian/bug/script
+++ b/debian/bug/script
@@ -2,26 +2,11 @@
exec >&3
-strip_md5sum() {
- sed 's/^.* \+//' "$@"
-}
-
-print_changed_files() {
- (cd / &&
- strip_md5sum "$@" |
- xargs md5sum 2>/dev/null | sort |
- comm -3 - <(sort "$@")
- ) | strip_md5sum | sort -u
-
-}
-
files_in_usrlocal() {
[ ! -d /usr/local/share/request-tracker4/ ] || [ `find /usr/local/share/request-tracker4/ -type f | wc -l` -gt 0 ] && echo -e "\nThere are locally modified files in /usr/local/share/request-tracker4/,\n these may (or may not) be the source of the problem.\n"
}
-sumfile=/var/lib/dpkg/info/request-tracker4.md5sums
-
echo "Changed files:"
-print_changed_files "$sumfile" | sed 's/^/ /'
+dpkg --verify --verify-format rpm request-tracker4 | awk '{ print " " $2 }'
files_in_usrlocal
diff --git a/debian/changelog b/debian/changelog
index 66daabf..23c6c40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+request-tracker4 (4.4.3-1) unstable; urgency=medium
+
+ [ Niels Thykier ]
+ * Declare the explicit requirement for (fake)root
+
+ [ Dominic Hargreaves ]
+ * debian/bug/script: use dpkg --verify to avoid manual access to
+ dpkg database (Closes: #905703)
+ * New upstream release
+ - Fix bug in system configuration display with regexps (Closes: #895600)
+ * Drop dependency on dh-systemd (thanks, Lintian)
+ * Mark rt4-standlone as being a metapackage to avoid Lintian warning
+ (Closes: #907420)
+ * Replace exim4 with default-mta in Depends (thanks, Lintian)
+ * Force the use of Cpanel::JSON::XS (Closes: #848041)
+
+ -- Dominic Hargreaves <dom@earth.li> Sun, 09 Sep 2018 22:40:16 +0100
+
request-tracker4 (4.4.2-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 439f297..462aa65 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,8 @@ XSBC-Original-Uploaders: Niko Tyni <ntyni@debian.org>,
Bugs: mailto:maintainers@lists.progress-linux.org
Section: misc
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160709),
dh-autoreconf,
- dh-systemd,
gnupg1,
libapache-session-perl,
libbusiness-hours-perl,
@@ -18,9 +17,9 @@ Build-Depends: debhelper (>= 9),
libcgi-psgi-perl,
libcss-minifier-xs-perl,
libclass-accessor-perl,
+ libclone-perl,
libconvert-color-perl,
libcrypt-eksblowfish-perl,
- libcrypt-ssleay-perl,
libcrypt-x509-perl,
libcss-squish-perl,
libdata-guid-perl,
@@ -125,6 +124,7 @@ Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/pack
XSBC-Original-Vcs-Browser: https://salsa.debian.org/request-tracker-team/request-tracker4
XSBC-Original-Vcs-Git: https://salsa.debian.org/request-tracker-team/request-tracker4.git
Homepage: http://bestpractical.com/rt/
+Rules-Requires-Root: binary-targets
Package: request-tracker4
Architecture: all
@@ -133,7 +133,7 @@ Depends: ${perl:Depends}, ${misc:Depends},
rt4-standalone (= ${source:Version}) | rt4-apache2 (= ${source:Version}) | rt4-fcgi (= ${source:Version}),
rt4-db-sqlite (= ${source:Version}) | rt4-db-postgresql (= ${source:Version}) | rt4-db-mysql (= ${source:Version}),
dbconfig-common | dbconfig-no-thanks,
- exim4 | mail-transport-agent,
+ default-mta | mail-transport-agent,
fonts-droid-fallback,
fonts-noto-hinted,
libapache-session-perl,
@@ -142,9 +142,9 @@ Depends: ${perl:Depends}, ${misc:Depends},
libcgi-pm-perl,
libcgi-psgi-perl,
libclass-accessor-perl,
+ libclone-perl,
libconvert-color-perl,
libcrypt-eksblowfish-perl,
- libcrypt-ssleay-perl,
libcrypt-x509-perl,
libcss-minifier-xs-perl,
libcss-squish-perl,
@@ -304,7 +304,7 @@ Description: Standalone web server support for request-tracker4
This package provides the 4 series of RT. It can be installed alongside
the 3.8 series without any problems.
.
- This package provides the standalone web server interface.
+ This metapackage provides the standalone web server interface.
Package: rt4-fcgi
Architecture: all
diff --git a/debian/patches/assettracker-sysgroups.diff b/debian/patches/assettracker-sysgroups.diff
index 50c601d..fb1b56a 100644
--- a/debian/patches/assettracker-sysgroups.diff
+++ b/debian/patches/assettracker-sysgroups.diff
@@ -1,4 +1,4 @@
-From 91fd50d5e7135aa872d58b9cc1be9dd86954fe8c Mon Sep 17 00:00:00 2001
+From a3f2ee266f6d6d3eebd7ae0c390aaf796dcf098b Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sat, 27 Dec 2014 23:19:03 +0200
Subject: Fix upgrade problems caused by an RTx::AssetTracker installation bug
@@ -17,7 +17,7 @@ Patch-Name: assettracker-sysgroups.diff
diff --git a/etc/upgrade/4.1.0/schema.SQLite b/etc/upgrade/4.1.0/schema.SQLite
new file mode 100644
-index 0000000..b38fded
+index 00000000..b38fded5
--- /dev/null
+++ b/etc/upgrade/4.1.0/schema.SQLite
@@ -0,0 +1,3 @@
diff --git a/debian/patches/debianize_UPGRADING-4.2.diff b/debian/patches/debianize_UPGRADING-4.2.diff
index 0bcfdfe..667ce64 100644
--- a/debian/patches/debianize_UPGRADING-4.2.diff
+++ b/debian/patches/debianize_UPGRADING-4.2.diff
@@ -1,4 +1,4 @@
-From 674739569cd4c78fcea446d38adff746f28cdd11 Mon Sep 17 00:00:00 2001
+From d5d58e8232e5042f6e462434953f14361b098537 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 23 Feb 2014 22:48:50 +0000
Subject: Debianize UPGRADING-4.2
@@ -10,7 +10,7 @@ Patch-Name: debianize_UPGRADING-4.2.diff
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/UPGRADING-4.2 b/docs/UPGRADING-4.2
-index 45a000e..9c14453 100644
+index 45a000e8..9c144536 100644
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@ -107,7 +107,7 @@ extra transactions, and keeping the summed time spent consistent.
diff --git a/debian/patches/debianize_backup_docs.diff b/debian/patches/debianize_backup_docs.diff
index 02b2cd4..d05cdf2 100644
--- a/debian/patches/debianize_backup_docs.diff
+++ b/debian/patches/debianize_backup_docs.diff
@@ -1,4 +1,4 @@
-From 87262709633ca87befdfc10b8907ccc14bd8c209 Mon Sep 17 00:00:00 2001
+From 4f17defa863e4c0629f418616535aebde85b803b Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Wed, 27 Mar 2013 23:36:30 +0000
Subject: Customise backup docs for Debian
@@ -10,10 +10,10 @@ Patch-Name: debianize_backup_docs.diff
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/docs/backups.pod b/docs/backups.pod
-index 768e7d5..1fc8179 100644
+index 0f9507e3..c832551c 100644
--- a/docs/backups.pod
+++ b/docs/backups.pod
-@@ -16,6 +16,13 @@ Test your backups regularly to discover any unknown problems B<before> they
+@@ -24,6 +24,13 @@ Test your backups regularly to discover any unknown problems B<before> they
become an issue. You don't want to discover problems with your backups while
tensely restoring from them in a critical data loss situation.
@@ -27,7 +27,7 @@ index 768e7d5..1fc8179 100644
=head2 DATABASE
You should backup the entire RT database, although for improved speed and space
-@@ -146,25 +153,34 @@ can run C<analyze verbose>.
+@@ -157,25 +164,34 @@ can run C<analyze verbose>.
=back
@@ -70,7 +70,7 @@ index 768e7d5..1fc8179 100644
=item /etc/aliases
-@@ -182,9 +198,12 @@ The location of these files is highly dependent on what software you're using.
+@@ -193,9 +209,12 @@ The location of these files is highly dependent on what software you're using.
=item Crontab containing RT's cronjobs
@@ -86,7 +86,7 @@ index 768e7d5..1fc8179 100644
If you have custom L<< C<rt-crontool> >> invocations, you don't want to have to
recreate those.
-@@ -205,7 +224,7 @@ regarding backups.
+@@ -216,7 +235,7 @@ regarding backups.
Simply saving a tarball should be sufficient, with something like:
diff --git a/debian/patches/debianize_docs_local.diff b/debian/patches/debianize_docs_local.diff
index 67850bc..92b3909 100644
--- a/debian/patches/debianize_docs_local.diff
+++ b/debian/patches/debianize_docs_local.diff
@@ -1,4 +1,4 @@
-From c374fac563dd04f39a8e8dfe9f8bd87ed77aa8ad Mon Sep 17 00:00:00 2001
+From 6d46880f1f4d47d12a29716fc4d9a2298f6a02e8 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Wed, 27 Mar 2013 23:42:04 +0000
Subject: Reference correct local directory for Debian
@@ -12,7 +12,7 @@ Patch-Name: debianize_docs_local.diff
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/customizing/styling_rt.pod b/docs/customizing/styling_rt.pod
-index 80687a4..1eead15 100644
+index 80687a43..1eead153 100644
--- a/docs/customizing/styling_rt.pod
+++ b/docs/customizing/styling_rt.pod
@@ -93,7 +93,7 @@ default CSS styles, via the C<@CSSFiles> configuration option. To add
@@ -36,7 +36,7 @@ index 80687a4..1eead15 100644
$ mkdir -p local/html/NoAuth/css/localstyle
$ cp -R share/html/NoAuth/css/rudder/* local/html/NoAuth/css/localstyle/
diff --git a/docs/extending/clickable_links.pod b/docs/extending/clickable_links.pod
-index d52ea59..89a744a 100644
+index d52ea599..89a744ad 100644
--- a/docs/extending/clickable_links.pod
+++ b/docs/extending/clickable_links.pod
@@ -54,7 +54,7 @@ arbitrary HTML.
@@ -58,7 +58,7 @@ index d52ea59..89a744a 100644
<%ARGS>
diff --git a/docs/initialdata.pod b/docs/initialdata.pod
-index f862fde..eaf0181 100644
+index f862fde7..eaf0181c 100644
--- a/docs/initialdata.pod
+++ b/docs/initialdata.pod
@@ -24,7 +24,7 @@ of one another while the top level initialdata file is for fresh RT installs.
diff --git a/debian/patches/debianize_version.diff b/debian/patches/debianize_version.diff
index 4c5829d..190e8a8 100644
--- a/debian/patches/debianize_version.diff
+++ b/debian/patches/debianize_version.diff
@@ -1,4 +1,4 @@
-From 291d2dbfbec6bbcb4ff94b0b63f1112329312afb Mon Sep 17 00:00:00 2001
+From e57712aab49dca8ba77f7eed41f5e7090a605b4a Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Thu, 31 Dec 2015 12:17:56 +0000
Subject: Extract the correct (Debian) version number in configure.ac
@@ -13,7 +13,7 @@ Patch-Name: debianize_version.diff
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 6b9e88c..1cf1f83 100755
+index d7685d80..c147028a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_REVISION($Revision$)dnl
@@ -41,15 +41,15 @@ index 6b9e88c..1cf1f83 100755
test "x$rt_version_minor" = 'x' && rt_version_minor=0
test "x$rt_version_patch" = 'x' && rt_version_patch=0
diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
-index c54a5bf..b02dccb 100644
+index 49a7ee10..c22cb9cb 100644
--- a/share/html/Elements/Footer
+++ b/share/html/Elements/Footer
@@ -53,7 +53,7 @@
% if ($m->{'rt_base_time'}) {
<p id="time"><span><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></span></p>
%}
-- <p id="bpscredits"><span><&|/l_unsafe, '&#187;&#124;&#171;', $RT::VERSION, '2017', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
-+ <p id="bpscredits"><span><&|/l_unsafe, '&#187;&#124;&#171;', $RT::VERSION . ' (Debian)', '2017', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
+- <p id="bpscredits"><span><&|/l_unsafe, '&#187;&#124;&#171;', $RT::VERSION, '2018', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
++ <p id="bpscredits"><span><&|/l_unsafe, '&#187;&#124;&#171;', $RT::VERSION . ' (Debian)', '2018', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
</span></p>
% if (!$Menu) {
<p id="legal"><&|/l_unsafe, '<a href="http://www.gnu.org/licenses/gpl-2.0.html">', '</a>' &>Distributed under [_1]version 2 of the GNU GPL[_2].</&><br /><&|/l_unsafe, '<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br /></p>
diff --git a/debian/patches/fix_lintian_privacy_break_logo_error.diff b/debian/patches/fix_lintian_privacy_break_logo_error.diff
index bb05a78..33be296 100644
--- a/debian/patches/fix_lintian_privacy_break_logo_error.diff
+++ b/debian/patches/fix_lintian_privacy_break_logo_error.diff
@@ -1,4 +1,4 @@
-From e3fc9cec5bab19c3922cf7756f2ae6d7b677c181 Mon Sep 17 00:00:00 2001
+From 03ab7aaeb9452b319a74c8fe95a95b86467aa4f2 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 16 Feb 2014 16:11:43 +0000
Subject: Don't include remote image references or redirects in broken install
@@ -13,7 +13,7 @@ Patch-Name: fix_lintian_privacy_break_logo_error.diff
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/html/index.html b/share/html/index.html
-index e6b2ec0..95a5204 100644
+index e0c048e5..05a696e8 100644
--- a/share/html/index.html
+++ b/share/html/index.html
@@ -5,11 +5,9 @@
diff --git a/debian/patches/fonts_use_noto_sans.diff b/debian/patches/fonts_use_noto_sans.diff
index 4bfebfb..d651b02 100644
--- a/debian/patches/fonts_use_noto_sans.diff
+++ b/debian/patches/fonts_use_noto_sans.diff
@@ -1,4 +1,4 @@
-From 9f179e00d53a6a0ec555da5c502691936c70f708 Mon Sep 17 00:00:00 2001
+From 4d708e9ab1bcb3a95dff4f4475068f0067c75c0e Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Fri, 1 Jan 2016 18:23:08 +0000
Subject: Use Noto Sans instead of Droid Sans
@@ -13,10 +13,10 @@ Patch-Name: fonts_use_noto_sans.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
-index 64386eb..ce7f1d2 100644
+index 6fe7bc7a..52837c5d 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
-@@ -1214,7 +1214,7 @@ Set(
+@@ -1231,7 +1231,7 @@ Set(
'zh-cn' => "$RT::FontPath/DroidSansFallback.ttf",
'zh-tw' => "$RT::FontPath/DroidSansFallback.ttf",
'ja' => "$RT::FontPath/DroidSansFallback.ttf",
diff --git a/debian/patches/layout.diff b/debian/patches/layout.diff
index 7f2a306..4444cfc 100644
--- a/debian/patches/layout.diff
+++ b/debian/patches/layout.diff
@@ -1,4 +1,4 @@
-From 6028dad0483865254a1de0f248b9cee4fd5257b2 Mon Sep 17 00:00:00 2001
+From 145f792e75e6d8d876192a3ff1da288106999641 Mon Sep 17 00:00:00 2001
From: Stephen Quinney <sjq@debian.org>
Date: Sun, 24 Mar 2013 18:38:05 +0000
Subject: Add Debian layout (FHS-compatible)
@@ -11,7 +11,7 @@ Patch-Name: layout.diff
1 file changed, 29 insertions(+)
diff --git a/config.layout b/config.layout
-index 15fcf08..fa0c6c4 100644
+index 15fcf083..fa0c6c44 100644
--- a/config.layout
+++ b/config.layout
@@ -214,3 +214,32 @@
diff --git a/debian/patches/load_rt_generated.diff b/debian/patches/load_rt_generated.diff
index ed16525..253e6e0 100644
--- a/debian/patches/load_rt_generated.diff
+++ b/debian/patches/load_rt_generated.diff
@@ -1,4 +1,4 @@
-From 8d3cc16aec0e12078c49369210770000b54415dc Mon Sep 17 00:00:00 2001
+From 403bd8d619eb9c217f4983efa1f4f63d97a5339b Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Wed, 6 May 2015 22:29:35 +0000
Subject: Load RT::Generated directly from @INC
@@ -12,10 +12,10 @@ Patch-Name: load_rt_generated.diff
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/RT.pm b/lib/RT.pm
-index 5775bdf..f36c9e1 100644
+index af4a7bd7..05470426 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
-@@ -786,10 +786,8 @@ sub InstallMode {
+@@ -804,10 +804,8 @@ sub InstallMode {
sub LoadGeneratedData {
my $class = shift;
diff --git a/debian/patches/no_test_web_installer.diff b/debian/patches/no_test_web_installer.diff
index 7908128..5b2ce21 100644
--- a/debian/patches/no_test_web_installer.diff
+++ b/debian/patches/no_test_web_installer.diff
@@ -1,4 +1,4 @@
-From d0d5f388d1d86c77922bf15e0d42893affd3eacf Mon Sep 17 00:00:00 2001
+From f26f26a834ea83cce585d1f5dbc2480f808c2e6d Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 2 Jun 2013 13:47:42 +0100
Subject: Don't test the web installer
@@ -24,7 +24,7 @@ Patch-Name: no_test_web_installer.diff
1 file changed, 2 insertions(+)
diff --git a/t/web/installer.t b/t/web/installer.t
-index a690e1a..174a433 100644
+index 900a4d71..8f490842 100644
--- a/t/web/installer.t
+++ b/t/web/installer.t
@@ -7,6 +7,8 @@ use RT::Test
diff --git a/debian/patches/no_testdeps.diff b/debian/patches/no_testdeps.diff
index 835634d..7aab6e2 100644
--- a/debian/patches/no_testdeps.diff
+++ b/debian/patches/no_testdeps.diff
@@ -1,4 +1,4 @@
-From 08dacaf509d7bc32f3718d5dfe77bc0b465bab94 Mon Sep 17 00:00:00 2001
+From 1ea16bec8ae7d645384b4d486b40f01b278feaca Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 24 Mar 2013 18:38:11 +0000
Subject: Don't run the testdeps portion of configuration
@@ -12,10 +12,10 @@ Patch-Name: no_testdeps.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index 464bda0..418c33c 100644
+index cc418241..2242f815 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -359,7 +359,7 @@ clean-mason-cache:
+@@ -360,7 +360,7 @@ clean-mason-cache:
rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
diff --git a/debian/patches/rt_setup_database_upgrade_basedir.diff b/debian/patches/rt_setup_database_upgrade_basedir.diff
index 18f9f65..38bd065 100644
--- a/debian/patches/rt_setup_database_upgrade_basedir.diff
+++ b/debian/patches/rt_setup_database_upgrade_basedir.diff
@@ -1,4 +1,4 @@
-From e8dc4d4972f75adf6e4db6ac0ee8469313797808 Mon Sep 17 00:00:00 2001
+From f94b5dcecc7924e48b85da3d2410c1c38cebb501 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 24 Mar 2013 18:38:07 +0000
Subject: Fix relative references to config path
@@ -13,7 +13,7 @@ Patch-Name: rt_setup_database_upgrade_basedir.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
-index 6cd7f35..4e4f84f 100644
+index c89a0715..ef324255 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -421,7 +421,7 @@ sub action_insert {
diff --git a/debian/patches/rt_test_db_type.diff b/debian/patches/rt_test_db_type.diff
index fc2c4d5..cf8ecde 100644
--- a/debian/patches/rt_test_db_type.diff
+++ b/debian/patches/rt_test_db_type.diff
@@ -1,4 +1,4 @@
-From f5b5688f1c14b85e49b79f5566cb65dc298d1eb9 Mon Sep 17 00:00:00 2001
+From 090518f6e1f04eacec833f6027c429b1cbff4253 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Thu, 7 May 2015 21:37:37 +0000
Subject: Allow overriding DatabaseType from the environment in RT::Test
@@ -9,10 +9,10 @@ Patch-Name: rt_test_db_type.diff
1 file changed, 3 insertions(+)
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
-index 2eabbac..f8c8f20 100644
+index de713d2f..636ca3a7 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
-@@ -310,6 +310,9 @@ Set( \@LexiconLanguages, qw(en zh_TW zh_CN fr ja));
+@@ -314,6 +314,9 @@ Set( \@LexiconLanguages, qw(en zh_TW zh_CN fr ja));
Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/i);
Set( \$ShowHistory, "always");
};
diff --git a/debian/patches/runtime_gpg1.diff b/debian/patches/runtime_gpg1.diff
index d94cad1..44fa054 100644
--- a/debian/patches/runtime_gpg1.diff
+++ b/debian/patches/runtime_gpg1.diff
@@ -1,4 +1,4 @@
-From 5959c80b12187ea6c2f52ff09c9bee7de550c4dd Mon Sep 17 00:00:00 2001
+From 17db5d54196ec24585a9d41e3b8a84d59237e0ce Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sat, 26 Nov 2016 16:42:39 +0000
Subject: Use gpg1 rather than gpg in runtime
@@ -15,10 +15,10 @@ Patch-Name: runtime_gpg1.diff
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
-index ce7f1d2..ce44723 100644
+index 52837c5d..25a7c659 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
-@@ -2915,7 +2915,7 @@ signatures instead of 'RFC' (GPG/MIME: RFC3156 and RFC1847) format.
+@@ -2968,7 +2968,7 @@ signatures instead of 'RFC' (GPG/MIME: RFC3156 and RFC1847) format.
Set(%GnuPG,
Enable => @RT_GPG@,
diff --git a/debian/patches/series b/debian/patches/series
index 4b42df8..c22af6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,7 +16,7 @@ test_gpg1.diff
test_locale.diff
test_gnupg-interface_gpg1.diff
runtime_gpg1.diff
-unescaped_left_brace.patch
+use_cpanel_json_xs.diff
progress-linux/0001-footer-credits.patch
progress-linux/0002-header-name.patch
progress-linux/0003-login-version.patch
diff --git a/debian/patches/sitemodules.diff b/debian/patches/sitemodules.diff
index 7ab9649..d1a4f76 100644
--- a/debian/patches/sitemodules.diff
+++ b/debian/patches/sitemodules.diff
@@ -1,4 +1,4 @@
-From d1c94ea5e8745a5c37dcb81b1fed19ded44ca209 Mon Sep 17 00:00:00 2001
+From 00249667856f4b5e8cb3c03403190a4b16b1981c Mon Sep 17 00:00:00 2001
From: Stephen Quinney <sjq@debian.org>
Date: Sun, 24 Mar 2013 18:38:06 +0000
Subject: Use RT_SiteModules.pm in lib/RT/Interface/Web/Handler.pm
@@ -11,7 +11,7 @@ Patch-Name: sitemodules.diff
1 file changed, 1 insertion(+)
diff --git a/lib/RT/Interface/Web/Handler.pm b/lib/RT/Interface/Web/Handler.pm
-index 0d28c27..28dda74 100644
+index 8f104fa1..13676ad8 100644
--- a/lib/RT/Interface/Web/Handler.pm
+++ b/lib/RT/Interface/Web/Handler.pm
@@ -56,6 +56,7 @@ use Text::Wrapper;
diff --git a/debian/patches/test_gnupg-interface_gpg1.diff b/debian/patches/test_gnupg-interface_gpg1.diff
index ad02300..7671eaf 100644
--- a/debian/patches/test_gnupg-interface_gpg1.diff
+++ b/debian/patches/test_gnupg-interface_gpg1.diff
@@ -1,4 +1,4 @@
-From 0b2be948b4a15ebac21d811328fcada40d2ac8ab Mon Sep 17 00:00:00 2001
+From 1efa173383dfffcf8454ad79f0fecb536c83f434 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa@debian.org>
Date: Tue, 11 Oct 2016 21:52:45 +0200
Subject: Force gpg1 in RT::Test::GnuPG's configuration
@@ -12,7 +12,7 @@ Patch-Name: test_gnupg-interface_gpg1.diff
1 file changed, 1 insertion(+)
diff --git a/lib/RT/Test/GnuPG.pm b/lib/RT/Test/GnuPG.pm
-index 7667e02..45049db 100644
+index 3a3d424e..0fb69bb7 100644
--- a/lib/RT/Test/GnuPG.pm
+++ b/lib/RT/Test/GnuPG.pm
@@ -104,6 +104,7 @@ sub bootstrap_more_config {
diff --git a/debian/patches/test_gpg1.diff b/debian/patches/test_gpg1.diff
index afc8854..0ab559c 100644
--- a/debian/patches/test_gpg1.diff
+++ b/debian/patches/test_gpg1.diff
@@ -1,4 +1,4 @@
-From 8b530ef6d59d8b2dd5500f25a85359e2593ea4e2 Mon Sep 17 00:00:00 2001
+From 508f713e6317b52006d5d639c51077bdd888f942 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sat, 27 Aug 2016 14:15:46 +0100
Subject: Use gpg1 rather than gpg in test suite
@@ -12,7 +12,7 @@ Patch-Name: test_gpg1.diff
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/RT/Test/GnuPG.pm b/lib/RT/Test/GnuPG.pm
-index 0887592..7667e02 100644
+index b4bbb71a..3a3d424e 100644
--- a/lib/RT/Test/GnuPG.pm
+++ b/lib/RT/Test/GnuPG.pm
@@ -67,7 +67,7 @@ sub import {
@@ -25,7 +25,7 @@ index 0887592..7667e02 100644
$class->SUPER::import(%args);
return $class->export_to_level(1)
diff --git a/t/mail/gnupg-incoming.t b/t/mail/gnupg-incoming.t
-index 54b30d2..cb17e53 100644
+index 54b30d2a..cb17e537 100644
--- a/t/mail/gnupg-incoming.t
+++ b/t/mail/gnupg-incoming.t
@@ -69,7 +69,7 @@ my $buf = '';
diff --git a/debian/patches/test_locale.diff b/debian/patches/test_locale.diff
index d5a05c0..ba78146 100644
--- a/debian/patches/test_locale.diff
+++ b/debian/patches/test_locale.diff
@@ -1,4 +1,4 @@
-From 92d4a11f70fbb02a2d59e2659a09ea98ca153735 Mon Sep 17 00:00:00 2001
+From 920caa2501f6f62a74c2e677450b097ed92c41b7 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa@debian.org>
Date: Tue, 11 Oct 2016 20:40:39 +0200
Subject: set LC_ALL to C
@@ -15,10 +15,10 @@ Patch-Name: test_locale.diff
1 file changed, 1 insertion(+)
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
-index f8c8f20..e2887be 100644
+index 636ca3a7..6fe5b1f2 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
-@@ -113,6 +113,7 @@ our @SERVERS;
+@@ -114,6 +114,7 @@ my @ports; # keep track of all the random ports we used
BEGIN {
delete $ENV{$_} for qw/LANGUAGE LC_ALL LC_MESSAGES LANG/;
$ENV{LANG} = "C";
diff --git a/debian/patches/unescaped_left_brace.patch b/debian/patches/unescaped_left_brace.patch
deleted file mode 100644
index 0d89ac4..0000000
--- a/debian/patches/unescaped_left_brace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 12eb8053d45063869a9ace26e8f9289691f9d390 Mon Sep 17 00:00:00 2001
-From: Dominic Hargreaves <dom@earth.li>
-Date: Mon, 19 Jun 2017 19:29:42 +0100
-Subject: Fix "Unescaped left brace in regex" warning in perl 5.26
-
-Bug-Debian: https://bugs.debian.org/865047
-Patch-Name: unescaped_left_brace.patch
----
- share/html/Search/Elements/EditSort | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
-index 4ab0800..4853e17 100644
---- a/share/html/Search/Elements/EditSort
-+++ b/share/html/Search/Elements/EditSort
-@@ -119,7 +119,7 @@ $fields{$_} = $_ for @cfs;
- # Add all available CustomRoles to the list of sortable columns.
- my @roles = grep /^CustomRole/, @{$ARGS{AvailableColumns}};
- for my $role (@roles) {
-- my ($label) = $role =~ /^CustomRole.{(.*)}$/;
-+ my ($label) = $role =~ /^CustomRole.\{(.*)\}$/;
- my $value = $role;
- $fields{$label . '.EmailAddress' } = $value . '.EmailAddress';
- }
diff --git a/debian/patches/use_cpanel_json_xs.diff b/debian/patches/use_cpanel_json_xs.diff
new file mode 100644
index 0000000..c8f8396
--- /dev/null
+++ b/debian/patches/use_cpanel_json_xs.diff
@@ -0,0 +1,30 @@
+From 20766b8eaa377b556aaaded81576c43058a0586e Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <dom@earth.li>
+Date: Sun, 9 Sep 2018 21:35:08 +0100
+Subject: Force the use of Cpanel::JSON::XS
+
+JSON::XS breaks RT due to the removed from_json/to_json methods and JSON.pm
+prefers JSON::XS to our preferred implementation Cpanel::JSON::XS by
+default.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848041
+Patch-Name: use_cpanel_json_xs.diff
+---
+ lib/RT/Interface/Web.pm | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
+index a38b1471..c897a7dc 100644
+--- a/lib/RT/Interface/Web.pm
++++ b/lib/RT/Interface/Web.pm
+@@ -63,6 +63,10 @@ use warnings;
+
+ package RT::Interface::Web;
+
++# Debian modification; see
++# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848041
++BEGIN { $ENV{PERL_JSON_BACKEND}='Cpanel::JSON::XS'; }
++
+ use RT::SavedSearches;
+ use RT::CustomRoles;
+ use URI qw();
diff --git a/debian/postinst b/debian/postinst
index 6aa999c..30ff40b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -35,7 +35,8 @@ alts() {
"/usr/sbin/rt-importer 8" \
"/usr/sbin/rt-serializer 8" \
"/usr/sbin/rt-externalize-attachments 8" \
- "/usr/sbin/rt-ldapimport 8" ; do
+ "/usr/sbin/rt-ldapimport 8" \
+ "/usr/sbin/rt-passwd 8"; do
set -- $x; alt=$1; manext=$2; base=`basename $alt`
update-alternatives \
--install $alt $base $alt-$branch_version $branch_priority \
diff --git a/debian/prerm b/debian/prerm
index a8da729..85885f6 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -13,7 +13,7 @@ alts() {
/usr/sbin/rt-preferences-viewer /usr/sbin/rt-validate-aliases \
/usr/sbin/rt-importer /usr/sbin/rt-serializer \
/usr/sbin/rt-externalize-attachments \
- /usr/sbin/rt-ldapimport; do
+ /usr/sbin/rt-ldapimport /usr/sbin/rt-passwd; do
alt=`basename $bin`
update-alternatives --remove $alt $bin-4
done
diff --git a/debian/whatis b/debian/whatis
index 2efc876..fd17dd9 100644
--- a/debian/whatis
+++ b/debian/whatis
@@ -19,3 +19,4 @@ sbin/rt-importer(8) Import a serialized RT database on top of the current one
sbin/rt-serializer(8) Serialize an RT database to disk
sbin/rt-externalize-attachments(8) Move attachments from database to external storage
sbin/rt-ldapimport(8) Import user attributes from an LDAP directory
+sbin/rt-passwd(8) Set an RT user's password