Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Zimbra/packages
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f9e9b13a6914df5338d46481aea28eaa452854cd
Choose a base ref
..
head repository: Zimbra/packages
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1f67f3b9e2c8e3d214eae405138793abec6a9613
Choose a head ref
Showing with 3,071 additions and 62 deletions.
  1. +12 −0 thirdparty/amavisd/patches/zbug-1457.patch
  2. +6 −0 thirdparty/amavisd/zimbra-amavisd/debian/changelog
  3. +1 −0 thirdparty/amavisd/zimbra-amavisd/debian/patches/series
  4. +7 −1 thirdparty/amavisd/zimbra-amavisd/rpm/SPECS/amavisd.spec
  5. +1,576 −0 thirdparty/cyrus-sasl/patches/sasl-auth-zimbra-2.1.28.patch
  6. +24 −0 thirdparty/cyrus-sasl/patches/saslauthd-conf-2.1.28.patch
  7. +117 −0 thirdparty/cyrus-sasl/patches/testsaslauthd.c.patch
  8. +6 −0 thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/changelog
  9. +3 −3 thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/patches/series
  10. +1 −7 thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/rules
  11. +6 −11 thirdparty/cyrus-sasl/zimbra-cyrus-sasl/rpm/SPECS/cyrus-sasl.spec
  12. +57 −0 thirdparty/erlang/Makefile
  13. +32 −0 thirdparty/erlang/patches/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
  14. +22 −0 thirdparty/erlang/patches/otp-0002-Do-not-install-C-sources.patch
  15. +336 −0 thirdparty/erlang/patches/otp-0003-Do-not-install-erlang-sources.patch
  16. +5 −0 thirdparty/erlang/zimbra-erlang/debian/changelog
  17. +1 −0 thirdparty/erlang/zimbra-erlang/debian/compat
  18. +14 −0 thirdparty/erlang/zimbra-erlang/debian/control
  19. +20 −0 thirdparty/erlang/zimbra-erlang/debian/copyright
  20. +3 −0 thirdparty/erlang/zimbra-erlang/debian/patches/series
  21. +72 −0 thirdparty/erlang/zimbra-erlang/debian/rules
  22. +1 −0 thirdparty/erlang/zimbra-erlang/debian/source/format
  23. +101 −0 thirdparty/erlang/zimbra-erlang/debian/zimbra-erlang.install
  24. +206 −0 thirdparty/erlang/zimbra-erlang/rpm/SPECS/erlang.spec
  25. +5 −5 thirdparty/openssl/patches/openssl-1.1.1-version-override.patch
  26. +6 −0 thirdparty/openssl/zimbra-openssl/debian/changelog
  27. +2 −0 thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec
  28. +59 −0 thirdparty/rabbitmq-server/Makefile
  29. +125 −0 thirdparty/rabbitmq-server/patches/rabbitmq-script-wrapper.patch
  30. +7 −0 thirdparty/rabbitmq-server/rabbitmq-env.conf
  31. +5 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/changelog
  32. +1 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/compat
  33. +14 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/control
  34. +21 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/copyright
  35. +1 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/patches/series
  36. +39 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/rules
  37. +1 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/source/format
  38. +4 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/zimbra-rabbitmq-server.install
  39. +10 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/zimbra-rabbitmq-server.postinst
  40. +64 −0 thirdparty/rabbitmq-server/zimbra-rabbitmq-server/rpm/SPECS/rabbitmq-server.spec
  41. +6 −0 thirdparty/unbound/zimbra-unbound/debian/changelog
  42. +0 −8 thirdparty/unbound/zimbra-unbound/debian/zimbra-unbound.postinst
  43. +3 −10 thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec
  44. +6 −2 versions.def
  45. +12 −0 zimbra/core-components/zimbra-core-components/debian/changelog
  46. +1 −1 zimbra/core-components/zimbra-core-components/debian/control
  47. +7 −3 zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec
  48. +6 −0 zimbra/dnscache-components/zimbra-dnscache-components/debian/changelog
  49. +1 −1 zimbra/dnscache-components/zimbra-dnscache-components/debian/control
  50. +4 −2 zimbra/dnscache-components/zimbra-dnscache-components/rpm/SPECS/dnscache-components.spec
  51. +12 −0 zimbra/ldap-components/zimbra-ldap-components/debian/changelog
  52. +1 −1 zimbra/ldap-components/zimbra-ldap-components/debian/control
  53. +7 −3 zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec
  54. +7 −1 zimbra/mta-components/zimbra-mta-components/debian/changelog
  55. +1 −1 zimbra/mta-components/zimbra-mta-components/debian/control
  56. +4 −2 zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec
12 changes: 12 additions & 0 deletions thirdparty/amavisd/patches/zbug-1457.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -ruN a/amavisd b/amavisd
--- a/amavisd 2022-08-22 09:25:28.945660379 +0000
+++ b/amavisd 2022-08-22 09:26:59.919428184 +0000
@@ -28124,7 +28124,7 @@
my $f = $bare_fnames->[$k]; my $multi = 0;
if ($one_at_a_time) { # glob templates may be substrings anywhere
local($1); @query_expanded = @query_template; # start afresh
- s{ ( {} (?: / \* )? | \* ) }
+ s{ ( \{\} (?: / \* )? | \* ) }
{ $1 eq '{}' ? "$tempdir/parts"
: $1 eq '{}/*' ? ($multi=1,"$tempdir/parts/$f")
: $1 eq '*' ? ($multi=1,$f) : $1
6 changes: 6 additions & 0 deletions thirdparty/amavisd/zimbra-amavisd/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
zimbra-amavisd (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium

* Fix ZBUG-1457

-- Zimbra Packaging Services <packaging-devel@zimbra.com> Mon, 22 Aug 2022 22:26:24 +0000

zimbra-amavisd (VERSION-ITERATIONZAPPEND) unstable; urgency=medium

* Initial Release.
1 change: 1 addition & 0 deletions thirdparty/amavisd/zimbra-amavisd/debian/patches/series
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@ amavis-mc.patch
perl-path.patch
socketpath.patch
zmq-sock.patch
zbug-1457.patch
8 changes: 7 additions & 1 deletion thirdparty/amavisd/zimbra-amavisd/rpm/SPECS/amavisd.spec
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
Summary: Zimbra's amavisd build
Name: zimbra-amavisd
Version: VERSION
Release: ITERATIONZAPPEND
Release: 1zimbra8.7b2ZAPPEND
License: GPL-2
Source: %{name}-%{version}.tar.bz2
Patch0: amavisd.patch
Patch1: amavis-mc.patch
Patch2: perl-path.patch
Patch3: socketpath.patch
Patch4: zmq-sock.patch
Patch5: zbug-1457.patch
Requires: perl, zimbra-mta-base
AutoReqProv: no
URL: http://www.ijs.si/software/amavisd/
@@ -25,6 +26,7 @@ The Zimbra amavisd build
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1

%build

@@ -40,3 +42,7 @@ cp amavisd-snmp-subagent-zmq ${RPM_BUILD_ROOT}OZC/sbin
%files
%defattr(-,root,root)
OZC/sbin

%changelog
* Mon Aug 22 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND
- Fix ZBUG-1457
Loading