Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZBUG-3126 : Compile apache with pcre #175

Merged
merged 3 commits into from Nov 26, 2022
Merged

ZBUG-3126 : Compile apache with pcre #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34d2ac9
ZBUG-3126:Compile apache with pcre
umagmrit Nov 23, 2022
3d82a13
ZBUG-3126:Updated apache-components to 2.0.9
umagmrit Nov 23, 2022
be99025
ZBUG-3126:Updated spell-components to 2.0.10
umagmrit Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions thirdparty/httpd/zimbra-httpd/debian/changelog
View file
Open in desktop
@@ -1,3 +1,9 @@
zimbra-httpd (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium

* Fix ZBUG-3126

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

zimbra-httpd (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium

* Fix ZBUG-2819, Upgraded Apache to 2.4.54
Expand Down
1 change: 1 addition & 0 deletions thirdparty/httpd/zimbra-httpd/debian/rules
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ override_dh_auto_configure:
--datadir=/opt/zimbra/data/httpd \
--enable-so \
--with-mpm=event \
--with-pcre=/usr/bin/pcre-config \
--enable-mpms-shared="all"

override_dh_strip:
Expand Down
5 changes: 4 additions & 1 deletion thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec
View file
Open in desktop
@@ -1,7 +1,7 @@
Summary: Zimbra's Apache HTTPD build
Name: zimbra-httpd
Version: VERSION
Release: 1zimbra8.7b3ZAPPEND
Release: 1zimbra8.7b4ZAPPEND
License: Apache-2.0
Source: %{name}-%{version}.tar.bz2
BuildRequires: zimbra-apr-devel
Expand All @@ -19,6 +19,8 @@ The Zimbra Apache HTTPD build
%define debug_package %{nil}

%changelog
* Wed Nov 23 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b4ZAPPEND
- Fix ZBUG-3126
* Tue Oct 18 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND
- Fix ZBUG-2819, Upgraded Apache to 2.4.54
* Tue Mar 15 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND
Expand Down Expand Up @@ -50,6 +52,7 @@ CFLAGS="-O2 -g"; export CFLAGS; \
--datadir=/opt/zimbra/data/httpd \
--enable-so \
--with-mpm=event \
--with-pcre=/usr/bin/pcre-config \
--enable-mpms-shared="all"
make

Expand Down
6 changes: 6 additions & 0 deletions zimbra/apache-components/zimbra-apache-components/debian/changelog
View file
Open in desktop
@@ -1,3 +1,9 @@
zimbra-apache-components (2.0.9-1zimbra8.8b1ZAPPEND) unstable; urgency=medium

* Fix ZBUG-3126

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

zimbra-apache-components (2.0.8-1zimbra8.8b1ZAPPEND) unstable; urgency=medium

* Fix ZBUG-2819, Upgraded Apache to 2.4.54
Expand Down
2 changes: 1 addition & 1 deletion zimbra/apache-components/zimbra-apache-components/debian/control
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ Standards-Version: 3.9.5
Package: zimbra-apache-components
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
zimbra-apache-base, zimbra-httpd (>= 2.4.54-1zimbra8.7b3ZAPPEND), zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND)
zimbra-apache-base, zimbra-httpd (>= 2.4.54-1zimbra8.7b4ZAPPEND), zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND)
Description: Zimbra components for apache package
Zimbra apache components pulls in all the packages used by
zimbra-apache
6 changes: 4 additions & 2 deletions zimbra/apache-components/zimbra-apache-components/rpm/SPECS/apache-components.spec
View file
Open in desktop
@@ -1,9 +1,9 @@
Summary: Zimbra components for apache package
Name: zimbra-apache-components
Version: 2.0.8
Version: 2.0.9
Release: 1zimbra8.8b1ZAPPEND
License: GPL-2
Requires: zimbra-apache-base, zimbra-httpd >= 2.4.54-1zimbra8.7b3ZAPPEND, zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND
Requires: zimbra-apache-base, zimbra-httpd >= 2.4.54-1zimbra8.7b4ZAPPEND, zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND
Packager: Zimbra Packaging Services <packaging-devel@zimbra.com>
Group: Development/Languages
AutoReqProv: no
Expand All @@ -15,6 +15,8 @@ Zimbra apache components pulls in all the packages used by
zimbra-apache

%changelog
* Wed Nov 23 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.9
- Fix ZBUG-3126
* Tue Oct 18 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.8
- Fix ZBUG-2819, Upgraded Apache to 2.4.54
* Tue Mar 15 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.7
Expand Down
6 changes: 6 additions & 0 deletions zimbra/spell-components/zimbra-spell-components/debian/changelog
View file
Open in desktop
@@ -1,3 +1,9 @@
zimbra-spell-components (2.0.10-1zimbra8.8b1ZAPPEND) unstable; urgency=medium

* Fix ZBUG-3126

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

zimbra-spell-components (2.0.9-1zimbra8.8b1ZAPPEND) unstable; urgency=medium

* Fix ZBUG-2819, Upgraded Apache to 2.4.54
Expand Down
2 changes: 1 addition & 1 deletion zimbra/spell-components/zimbra-spell-components/debian/control
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
zimbra-spell-base, zimbra-aspell-ar, zimbra-aspell-ca, zimbra-aspell-da, zimbra-aspell-de,
zimbra-aspell-en, zimbra-aspell-es, zimbra-aspell-fr, zimbra-aspell-hi,
zimbra-aspell-hu, zimbra-aspell-it, zimbra-aspell-nl, zimbra-aspell-pl,
zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd (>= 2.4.54-1zimbra8.7b3ZAPPEND),
zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd (>= 2.4.54-1zimbra8.7b4ZAPPEND),
zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND), zimbra-aspell-zimbra
Description: Zimbra components for spell package
Zimbra spell components pulls in all the packages used by
Expand Down
6 changes: 4 additions & 2 deletions zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec
View file
Open in desktop
@@ -1,12 +1,12 @@
Summary: Zimbra components for spell package
Name: zimbra-spell-components
Version: 2.0.9
Version: 2.0.10
Release: 1zimbra8.8b1ZAPPEND
License: GPL-2
Requires: zimbra-spell-base, zimbra-aspell-ar, zimbra-aspell-ca, zimbra-aspell-da, zimbra-aspell-de
Requires: zimbra-aspell-en, zimbra-aspell-es, zimbra-aspell-fr, zimbra-aspell-hi
Requires: zimbra-aspell-hu, zimbra-aspell-it, zimbra-aspell-nl, zimbra-aspell-pl
Requires: zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd >= 2.4.54-1zimbra8.7b3ZAPPEND
Requires: zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd >= 2.4.54-1zimbra8.7b4ZAPPEND
Requires: zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND, zimbra-aspell-zimbra
Packager: Zimbra Packaging Services <packaging-devel@zimbra.com>
Group: Development/Languages
Expand All @@ -19,6 +19,8 @@ Zimbra spell components pulls in all the packages used by
zimbra-spell

%changelog
* Wed Nov 23 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.10
- Fix ZBUG-3126
* Tue Oct 18 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.9
- Fix ZBUG-2819, Upgraded Apache to 2.4.54
* Tue Mar 15 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - 2.0.8
Expand Down