Switched to common address for package maintainers.
diff --git a/alpine/APKBUILD-base.in b/alpine/APKBUILD-base.in
index c28a3b3..b350c18 100644
--- a/alpine/APKBUILD-base.in
+++ b/alpine/APKBUILD-base.in
@@ -1,5 +1,4 @@
-# Maintainer: Andrei Belov <defan@nginx.com>
-# Contributor: Andrei Belov <defan@nginx.com>
+# Maintainer: %%PACKAGE_VENDOR%%
#
_base_version=%%BASE_VERSION%%
diff --git a/alpine/APKBUILD-module.in b/alpine/APKBUILD-module.in
index 4d36c32..a5c462d 100644
--- a/alpine/APKBUILD-module.in
+++ b/alpine/APKBUILD-module.in
@@ -1,5 +1,4 @@
-# Maintainer: Andrei Belov <defan@nginx.com>
-# Contributor: Andrei Belov <defan@nginx.com>
+# Maintainer: %%PACKAGE_VENDOR%%
#
_base_version=%%BASE_VERSION%%
diff --git a/alpine/APKBUILD-plus-module.in b/alpine/APKBUILD-plus-module.in
index 0dd3661..e9801db 100644
--- a/alpine/APKBUILD-plus-module.in
+++ b/alpine/APKBUILD-plus-module.in
@@ -1,5 +1,4 @@
-# Maintainer: Andrei Belov <defan@nginx.com>
-# Contributor: Andrei Belov <defan@nginx.com>
+# Maintainer: %%PACKAGE_VENDOR%%
#
_base_version=%%BASE_VERSION%%
diff --git a/alpine/Makefile b/alpine/Makefile
index 7a1ee7d..fdf75e0 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -13,6 +13,8 @@
include $(CONTRIB)/src/nginx$(BASE_SUFFIX)/version
+PACKAGE_VENDOR= NGINX Packaging <nginx-packaging@f5.com>
+
BASE_VERSION= $(NGINX_VERSION)
BASE_RELEASE= 1
PLUS_VERSION= $(NGINX_PLUS_VERSION)
@@ -113,6 +115,7 @@
${HOME}/.abuild/abuild.conf: ${HOME}/.abuild/abuild-key.rsa | ${HOME}/.abuild
echo PACKAGER_PRIVKEY=\"${HOME}/.abuild/abuild-key.rsa\" > ${HOME}/.abuild/abuild.conf
+ echo "PACKAGER=\"$(PACKAGE_VENDOR)\"" >> ${HOME}/.abuild/abuild.conf
list-base:
@printf "%-20s\t%s\n" nginx $(BASE_VERSION)-$(BASE_RELEASE)
@@ -165,6 +168,7 @@
cat nginx$(BASE_SUFFIX).initd.in | sed -e 's#%%DAEMON%%#nginx#g' > abuild-base/nginx$(BASE_SUFFIX).initd ; \
cat nginx$(BASE_SUFFIX).initd.in | sed -e 's#%%DAEMON%%#nginx-debug#g' > abuild-base/nginx$(BASE_SUFFIX)-debug.initd ; \
cat APKBUILD-base$(BASE_SUFFIX).in | sed \
+ -e 's#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g' \
-e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \
-e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \
-e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \
@@ -210,6 +214,7 @@
preinstall=`echo "$$MODULE_PREINSTALL_$(call modname, $*)" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
post=`echo "$$MODULE_POST_$(call modname, $*)" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
cat $(APKBUILD_TEMPLATE) | sed \
+ -e 's#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g' \
-e "s#%%MODULE%%#$${module_asis}#g" \
-e "s#%%SUMMARY%%#$(MODULE_SUMMARY_PREFIX) $(MODULE_SUMMARY_$(call modname, $*))#g" \
-e "s#%%BASE_VERSION%%#$(BASE_VERSION)#g" \
diff --git a/debian/Makefile b/debian/Makefile
index bf8d48e..c49c5c3 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -27,13 +27,11 @@
MODULE_SUMMARY_PREFIX=NGINX Plus
TARGET_VERSION=$(PLUS_VERSION)
BASE_ORIG_NAME=nginx-plus_$(PLUS_VERSION).orig.tar.gz
-MODULE_PACKAGE_VENDOR= Andrei Belov <defan@nginx.com>
MODULE_PACKAGE_URL= https://www.nginx.com/
else
MODULE_SUMMARY_PREFIX=nginx
TARGET_VERSION=$(BASE_VERSION)
BASE_ORIG_NAME=nginx_$(BASE_VERSION).orig.tar.gz
-MODULE_PACKAGE_VENDOR= Sergey Budnevitch <sb@nginx.com>
MODULE_PACKAGE_URL= https://nginx.org/
endif
@@ -41,6 +39,7 @@
MODULE_TARGET_PREFIX=$(TARGET_VERSION)+
MODULE_CONTROL_TEMPLATE= nginx$(MODULE_SUFFIX)-module.control.in
+PACKAGE_VENDOR= NGINX Packaging <nginx-packaging@f5.com>
CODENAME= $(shell lsb_release -cs)
ARCH= $(shell uname -m)
@@ -174,6 +173,7 @@
-e 's#%%PLUS_RELEASE%%#$(PLUS_RELEASE)#g' \
> debuild-base/$(SRCDIR)/debian/changelog ; \
cat nginx$(BASE_SUFFIX).control.in | sed \
+ -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
-e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \
-e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \
> debuild-base/$(SRCDIR)/debian/control ; \
@@ -285,7 +285,7 @@
post=`echo "$$MODULE_POST_$(call modname, $*)" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
cat $(MODULE_CONTROL_TEMPLATE) | sed \
-e "s#%%MODULE%%#$${module_asis}#g" \
- -e "s#%%MODULE_PACKAGE_VENDOR%%#$(MODULE_PACKAGE_VENDOR)#g" \
+ -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
-e "s#%%MODULE_PACKAGE_URL%%#$(MODULE_PACKAGE_URL)#g" \
-e "s#%%SUMMARY%%#$(MODULE_SUMMARY_PREFIX) $(MODULE_SUMMARY_$(call modname, $*))#g" \
-e "s#%%SHORT_SUMMARY%%#$(MODULE_SUMMARY_$(call modname, $*))#g" \
diff --git a/debian/nginx-module.control.in b/debian/nginx-module.control.in
index 1b489cb..6b96848 100644
--- a/debian/nginx-module.control.in
+++ b/debian/nginx-module.control.in
@@ -1,7 +1,7 @@
Source: nginx-module-%%MODULE%%
Section: httpd
Priority: optional
-Maintainer: %%MODULE_PACKAGE_VENDOR%%
+Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9~),
dpkg-dev (>= 1.16.1~),
quilt (>= 0.46-7~),
diff --git a/debian/nginx-plus-module.control.in b/debian/nginx-plus-module.control.in
index 8395e9d..5f41043 100644
--- a/debian/nginx-plus-module.control.in
+++ b/debian/nginx-plus-module.control.in
@@ -1,7 +1,7 @@
Source: nginx-plus-module-%%MODULE%%
Section: httpd
Priority: optional
-Maintainer: %%MODULE_PACKAGE_VENDOR%%
+Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9~),
dpkg-dev (>= 1.16.1~),
quilt (>= 0.46-7~),
diff --git a/debian/nginx.control.in b/debian/nginx.control.in
index 0474938..c44413d 100644
--- a/debian/nginx.control.in
+++ b/debian/nginx.control.in
@@ -1,7 +1,7 @@
Source: nginx
Section: httpd
Priority: optional
-Maintainer: Sergey Budnevitch <sb@nginx.com>
+Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9~),
dh-systemd,
dpkg-dev (>= 1.16.1~),
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index a7b1a88..01143da 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -27,14 +27,11 @@
MODULE_SUMMARY_PREFIX= NGINX Plus
TARGET_VERSION=$(PLUS_VERSION)
MODULE_SUFFIX=-plus
-MODULE_PACKAGER= Nginx Software, Inc. <https://www.nginx.com>
-MODULE_PACKAGE_VENDOR= Nginx Software, Inc.
MODULE_PACKAGE_URL= https://www.nginx.com/
MODULE_PACKAGE_LICENSE= Proprietary (EULA included)
else
MODULE_SUMMARY_PREFIX= nginx
TARGET_VERSION=$(BASE_VERSION)
-MODULE_PACKAGE_VENDOR= Nginx, Inc.
MODULE_PACKAGE_URL= https://nginx.org/
MODULE_PACKAGE_LICENSE=2-clause BSD-like license
endif
@@ -43,6 +40,8 @@
MODULE_PACKAGE_PREFIX=nginx$(MODULE_SUFFIX)-module
MODULE_TARGET_PREFIX=$(TARGET_VERSION)+
+PACKAGE_VENDOR= NGINX Packaging <nginx-packaging@f5.com>
+
BASE_MODULES= geoip image-filter njs perl xslt
MODULES=
@@ -161,6 +160,7 @@
cp -v $(CONTRIB)/src/nginx$(BASE_SUFFIX)/$$patch $(SRCPATH) ; \
done; \
cat nginx$(BASE_SUFFIX).spec.in | sed \
+ -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
-e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \
-e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \
-e 's#%%PLUS_VERSION%%#$(PLUS_VERSION)#g' \
@@ -251,8 +251,7 @@
post=`echo "$$MODULE_POST_$(call modname, $*)" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
cat $(MODULE_SPEC_TEMPLATE) | sed \
-e "s#%%NAME%%#$${pkgname}#g" \
- -e "s#%%MODULE_PACKAGER%%#$(MODULE_PACKAGER)#g" \
- -e "s#%%MODULE_PACKAGE_VENDOR%%#$(MODULE_PACKAGE_VENDOR)#g" \
+ -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
-e "s#%%MODULE_PACKAGE_URL%%#$(MODULE_PACKAGE_URL)#g" \
-e "s#%%MODULE_PACKAGE_LICENSE%%#$(MODULE_PACKAGE_LICENSE)#g" \
-e "s#%%SUMMARY%%#$(MODULE_SUMMARY_PREFIX) $(MODULE_SUMMARY_$(call modname, $*))#g" \
diff --git a/rpm/SPECS/nginx-module.spec.in b/rpm/SPECS/nginx-module.spec.in
index ada9436..5376cbe 100644
--- a/rpm/SPECS/nginx-module.spec.in
+++ b/rpm/SPECS/nginx-module.spec.in
@@ -50,7 +50,7 @@
Name: %%NAME%%
Version: %%VERSION_PREFIX%%%%VERSION%%
Release: %%RELEASE%%%{?dist}.ngx
-Vendor: %%MODULE_PACKAGE_VENDOR%%
+Vendor: %%PACKAGE_VENDOR%%
URL: %%MODULE_PACKAGE_URL%%
Group: %{_group}
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in
index ee62e86..13f7d2c 100644
--- a/rpm/SPECS/nginx-plus-module.spec.in
+++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -51,7 +51,7 @@
Name: %%NAME%%
Version: %%VERSION_PREFIX%%%%VERSION%%
Release: %%RELEASE%%%{?dist}.ngx
-Vendor: %%MODULE_PACKAGE_VENDOR%%
+Vendor: %%PACKAGE_VENDOR%%
URL: %%MODULE_PACKAGE_URL%%
Group: %{_group}
@@ -72,7 +72,6 @@
BuildRequires: pcre-devel
Requires: nginx-plus-r%{plus_version}
Provides: %{name}-r%{plus_version}
-Packager: %%MODULE_PACKAGER%%
%description
NGINX Plus: %%SHORT_SUMMARY%%.
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in
index f3b91ea..ff5a99c 100644
--- a/rpm/SPECS/nginx.spec.in
+++ b/rpm/SPECS/nginx.spec.in
@@ -70,7 +70,7 @@
Name: nginx
Version: %{base_version}
Release: %{base_release}
-Vendor: Nginx, Inc.
+Vendor: %%PACKAGE_VENDOR%%
URL: https://nginx.org/
Group: %{_group}
