From f90754f84a375d5183ed6883862d19dfd417225a Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Wed, 21 Apr 2021 16:07:26 +0300 Subject: Packages: switched to common address for package maintainers. --- pkg/deb/Makefile | 6 +++++ pkg/deb/debian.module/control-noarch.in | 2 +- pkg/deb/debian.module/control.in | 2 +- pkg/deb/debian/control | 41 --------------------------------- pkg/deb/debian/control.in | 41 +++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 43 deletions(-) delete mode 100644 pkg/deb/debian/control create mode 100644 pkg/deb/debian/control.in (limited to 'pkg/deb') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 8c33fc53..d28351d0 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) +PACKAGE_VENDOR = NGINX Packaging + SRCDIR= unit-$(VERSION) CODENAME = $(shell lsb_release -cs) @@ -205,6 +207,9 @@ debuild/$(SRCDIR)/debian: echo '9' > debuild/$(SRCDIR)/debian/compat ; \ mkdir -p debuild/$(SRCDIR)/debian/source ; \ echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \ + cat debian/control.in | sed \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ + > debuild/$(SRCDIR)/debian/control ; \ cat debian/rules.in | sed \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ > debuild/$(SRCDIR)/debian/rules ; \ @@ -280,6 +285,7 @@ endif -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \ -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in index e22bb49a..d9d9e5e1 100644 --- a/pkg/deb/debian.module/control-noarch.in +++ b/pkg/deb/debian.module/control-noarch.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev%%MODULE_BUILD_DEPENDS%% Standards-Version: 3.9.5 diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in index 7e28f5e9..9a6fa797 100644 --- a/pkg/deb/debian.module/control.in +++ b/pkg/deb/debian.module/control.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev, libssl-dev, diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control deleted file mode 100644 index a8e8cdc4..00000000 --- a/pkg/deb/debian/control +++ /dev/null @@ -1,41 +0,0 @@ -Source: unit -Section: admin -Priority: extra -Maintainer: Andrei Belov -Build-Depends: debhelper (>= 9), - linux-libc-dev, - libssl-dev, - libpcre2-dev -Standards-Version: 3.9.5 -Homepage: https://unit.nginx.org - -Package: unit -Section: admin -Architecture: any -Depends: lsb-base, - ${misc:Depends}, ${shlibs:Depends} -Description: NGINX Unit - NGINX Unit is a runtime and delivery environment for modern distributed - applications. It runs the application code in multiple languages - (PHP, Python, Go, etc.), and tightly couples it with traffic delivery - in and out of the application. Take this application server and proxy - directly in the cloud / container environments and fully control your app - dynamically via an API. - -Package: unit-dbg -Section: debug -Architecture: any -Priority: extra -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (debug symbols) - This package contains the debugging symbols for NGINX Unit. - -Package: unit-dev -Section: libdevel -Priority: optional -Architecture: any -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (development files) - Library and include files required for NGINX Unit modules development. diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in new file mode 100644 index 00000000..4d59520e --- /dev/null +++ b/pkg/deb/debian/control.in @@ -0,0 +1,41 @@ +Source: unit +Section: admin +Priority: extra +Maintainer: %%PACKAGE_VENDOR%% +Build-Depends: debhelper (>= 9), + linux-libc-dev, + libssl-dev, + libpcre2-dev +Standards-Version: 3.9.5 +Homepage: https://unit.nginx.org + +Package: unit +Section: admin +Architecture: any +Depends: lsb-base, + ${misc:Depends}, ${shlibs:Depends} +Description: NGINX Unit + NGINX Unit is a runtime and delivery environment for modern distributed + applications. It runs the application code in multiple languages + (PHP, Python, Go, etc.), and tightly couples it with traffic delivery + in and out of the application. Take this application server and proxy + directly in the cloud / container environments and fully control your app + dynamically via an API. + +Package: unit-dbg +Section: debug +Architecture: any +Priority: extra +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (debug symbols) + This package contains the debugging symbols for NGINX Unit. + +Package: unit-dev +Section: libdevel +Priority: optional +Architecture: any +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (development files) + Library and include files required for NGINX Unit modules development. -- cgit From e00ad18d8082f9db5c49c220d796c78beab53cae Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Thu, 27 May 2021 13:12:52 +0300 Subject: Packages: added Ubuntu 21.04 "hirsute" support. --- pkg/deb/Makefile | 15 +++++ pkg/deb/Makefile.jsc-common | 2 +- pkg/deb/Makefile.jsc16 | 71 ++++++++++++++++++++++ pkg/deb/Makefile.jsc17 | 71 ++++++++++++++++++++++ pkg/deb/Makefile.python39 | 46 ++++++++++++++ pkg/deb/debian.module/unit.example-jsc16-config | 15 +++++ pkg/deb/debian.module/unit.example-jsc17-config | 15 +++++ .../debian.module/unit.example-python3.9-config | 16 +++++ 8 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 pkg/deb/Makefile.jsc16 create mode 100644 pkg/deb/Makefile.jsc17 create mode 100644 pkg/deb/Makefile.python39 create mode 100644 pkg/deb/debian.module/unit.example-jsc16-config create mode 100644 pkg/deb/debian.module/unit.example-jsc17-config create mode 100644 pkg/deb/debian.module/unit.example-python3.9-config (limited to 'pkg/deb') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index d28351d0..c343eb53 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -19,6 +19,21 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 21.04 +ifeq ($(CODENAME),hirsute) +include Makefile.php +include Makefile.python27 +include Makefile.python39 +include Makefile.go +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +include Makefile.jsc15 +include Makefile.jsc16 +include Makefile.jsc17 +endif + # Ubuntu 20.10 ifeq ($(CODENAME),groovy) include Makefile.php diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index f7a6010b..1c4a77b5 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 1 -ifneq (,$(findstring $(CODENAME),groovy focal eoan disco buster)) +ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster)) JAVA_MINVERSION= 11 else JAVA_MINVERSION= 8 diff --git a/pkg/deb/Makefile.jsc16 b/pkg/deb/Makefile.jsc16 new file mode 100644 index 00000000..f45e1299 --- /dev/null +++ b/pkg/deb/Makefile.jsc16 @@ -0,0 +1,71 @@ +MODULES+= jsc16 +MODULE_SUFFIX_jsc16= jsc16 + +MODULE_SUMMARY_jsc16= Java 16 module for NGINX Unit + +MODULE_VERSION_jsc16= $(VERSION) +MODULE_RELEASE_jsc16= 1 + +MODULE_CONFARGS_jsc16= java --module=java16 --home=/usr/lib/jvm/java-16-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +MODULE_MAKEARGS_jsc16= java16 +MODULE_INSTARGS_jsc16= java16-install + +MODULE_SOURCES_jsc16= unit.example-jsc-app \ + unit.example-jsc16-config + +BUILD_DEPENDS_jsc16= openjdk-16-jdk-headless openjdk-16-jre-headless +BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc16) + +MODULE_BUILD_DEPENDS_jsc16=,openjdk-16-jdk-headless +MODULE_DEPENDS_jsc16=,openjdk-16-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) + +define MODULE_PREINSTALL_jsc16 + mkdir -p debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app + install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/jsc-app/index.jsp + install -m 644 -p debian/unit.example-jsc16-config debian/unit-jsc16/usr/share/doc/unit-jsc16/examples/unit.config + install -m 644 -p src/java/README.JSR-340 debian/unit-jsc16/usr/share/doc/unit-jsc16/ +endef +export MODULE_PREINSTALL_jsc16 + +define MODULE_POSTINSTALL_jsc16 + cd $$\(BUILDDIR_unit\) \&\& \ + DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall +endef +export MODULE_POSTINSTALL_jsc16 + +define MODULE_POST_jsc16 +cat <