Attachment 10386 Details for Bug 51472

[patch] Update php-krb5 packaging

51472-php-krb5.diff (text/plain), 11.08 KB, created by Philipp Hahn on 2020-06-12 10:26 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2020-06-12 10:26 CEST

Size: 11.08 KB

patch

obsolete

>From a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa Mon Sep 17 00:00:00 2001
>Message-Id: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Fri, 12 Jun 2020 09:19:01 +0200
>Subject: [PATCH 1/4] Bug #51472 php-krb5: Remove ucslint.overrides
>Organization: Univention GmbH, Bremen, Germany
>
>---
> saml/php-krb5/debian/ucslint.overrides | 3 ---
> 1 file changed, 3 deletions(-)
>
>diff --git a/saml/php-krb5/debian/ucslint.overrides b/saml/php-krb5/debian/ucslint.overrides
>index 8fafdb1b5f..5aa9f1d8e0 100644
>--- a/saml/php-krb5/debian/ucslint.overrides
>+++ b/saml/php-krb5/debian/ucslint.overrides
>@@ -1,5 +1,2 @@
> # No copyright for external project
> 0010-2
>-# External script
>-0013-2:src/ltmain.sh
>-0013-2:src/build/shtool
>-- 
>2.20.1
>
>
>From 8b628037b03b52c24a4cc51e20f92923641810b5 Mon Sep 17 00:00:00 2001
>Message-Id: <8b628037b03b52c24a4cc51e20f92923641810b5.1591950119.git.hahn@univention.de>
>In-Reply-To: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>References: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Fri, 12 Jun 2020 09:19:01 +0200
>Subject: [PATCH 2/4] Bug #51472 php-krb5: Add debian/watch
>Organization: Univention GmbH, Bremen, Germany
>
>for `uscan`
>---
> saml/php-krb5/debian/watch | 3 +++
> 1 file changed, 3 insertions(+)
> create mode 100644 saml/php-krb5/debian/watch
>
>diff --git a/saml/php-krb5/debian/watch b/saml/php-krb5/debian/watch
>new file mode 100644
>index 0000000000..93918f9f6d
>--- /dev/null
>+++ b/saml/php-krb5/debian/watch
>@@ -0,0 +1,3 @@
>+version=3
>+http://pecl.php.net/package/krb5 \
>+  /get/krb5-([\d\.]*).tgz  debian  uupdate
>-- 
>2.20.1
>
>
>From 699b9f4be0bfec3c97fdbc92fc1ead9a5aee35f4 Mon Sep 17 00:00:00 2001
>Message-Id: <699b9f4be0bfec3c97fdbc92fc1ead9a5aee35f4.1591950119.git.hahn@univention.de>
>In-Reply-To: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>References: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Fri, 12 Jun 2020 09:19:01 +0200
>Subject: [PATCH 3/4] Bug #51472 php-krb5: Remove useless build dependencies
>Organization: Univention GmbH, Bremen, Germany
>
>tar ist Essential: yes
>xsltproc is not used
>po-debconf is not used
>---
> saml/php-krb5/debian/control | 3 ---
> 1 file changed, 3 deletions(-)
>
>diff --git a/saml/php-krb5/debian/control b/saml/php-krb5/debian/control
>index f00049605e..d12d3d1388 100644
>--- a/saml/php-krb5/debian/control
>+++ b/saml/php-krb5/debian/control
>@@ -6,9 +6,6 @@ Build-Depends:
>  debhelper,
>  libkrb5-dev,
>  php7.3-dev,
>- po-debconf,
>- xsltproc,
>- tar,
> Standards-Version: 3.9.1
> Homepage: https://pecl.php.net/package/krb5
> 
>-- 
>2.20.1
>
>
>From 554db8d92e466850469e2961c3294a99a4962efa Mon Sep 17 00:00:00 2001
>Message-Id: <554db8d92e466850469e2961c3294a99a4962efa.1591950119.git.hahn@univention.de>
>In-Reply-To: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>References: <a16cacb5c8278e40e063fdfc4d1fbefdd2c3e1fa.1591950119.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Fri, 12 Jun 2020 09:19:01 +0200
>Subject: [PATCH 4/4] Bug #51472 php-krb5: Switch to dh-php
>Organization: Univention GmbH, Bremen, Germany
>
>It automatically detects the right PHP version.
>
>Is uses the correct CFLAGS for compiling.
>
>It does all the {pre,post}{inst,rm} magic correctly.
>
>Fix formatting of debian/control.
>Drop CREDITS file - part of debian/copyright
>
>Update debian/copyright.
>---
> saml/php-krb5/.gitignore               |  1 +
> saml/php-krb5/debian/control           |  9 ++++---
> saml/php-krb5/debian/copyright         |  6 -----
> saml/php-krb5/debian/php-krb5.docs     |  1 -
> saml/php-krb5/debian/php-krb5.install  |  1 -
> saml/php-krb5/debian/php-krb5.php      |  2 ++
> saml/php-krb5/debian/php-krb5.postinst | 36 --------------------------
> saml/php-krb5/debian/php-krb5.postrm   | 36 --------------------------
> saml/php-krb5/debian/rules             | 29 +--------------------
> 9 files changed, 9 insertions(+), 112 deletions(-)
> create mode 100644 saml/php-krb5/.gitignore
> delete mode 100644 saml/php-krb5/debian/php-krb5.install
> create mode 100644 saml/php-krb5/debian/php-krb5.php
> delete mode 100755 saml/php-krb5/debian/php-krb5.postinst
> delete mode 100755 saml/php-krb5/debian/php-krb5.postrm
>
>diff --git a/saml/php-krb5/.gitignore b/saml/php-krb5/.gitignore
>new file mode 100644
>index 0000000000..8eba6c8dd4
>--- /dev/null
>+++ b/saml/php-krb5/.gitignore
>@@ -0,0 +1 @@
>+src/
>diff --git a/saml/php-krb5/debian/control b/saml/php-krb5/debian/control
>index d12d3d1388..1c06bce4c4 100644
>--- a/saml/php-krb5/debian/control
>+++ b/saml/php-krb5/debian/control
>@@ -4,6 +4,7 @@ Priority: optional
> Maintainer: Univention GmbH <packages@univention.de>
> Build-Depends:
>  debhelper,
>+ dh-php,
>  libkrb5-dev,
>  php7.3-dev,
> Standards-Version: 3.9.1
>@@ -17,8 +18,8 @@ Depends:
>  ${shlibs:Depends},
> Description: krb5 module for PHP
>  Features:
>- + An interface for maintaining credential caches (KRB5CCache),
>+  - An interface for maintaining credential caches (KRB5CCache),
>     that can be used for authenticating against a kerberos5 realm
>- + Bindings for nearly the complete GSSAPI (RFC2744) + The
>- administrative interface (KADM5) + Support for HTTP Negotiate
>- authentication via GSSAPI
>+  - Bindings for nearly the complete GSSAPI (RFC2744)
>+  - The administrative interface (KADM5)
>+  - Support for HTTP Negotiate authentication via GSSAPI
>diff --git a/saml/php-krb5/debian/copyright b/saml/php-krb5/debian/copyright
>index b187ad727b..1fcc0446cf 100644
>--- a/saml/php-krb5/debian/copyright
>+++ b/saml/php-krb5/debian/copyright
>@@ -27,7 +27,6 @@ License: Expat
> 
> Files: debian/*
> Copyright: 2015-2020 Univention GmbH
>- 2005 Uwe Steinmann.
> License: AGPL-3.0-only
>  The source code of the software contained in this package
>  as well as the source package itself are made available
>@@ -51,11 +50,6 @@ License: AGPL-3.0-only
>  /usr/share/common-licenses/AGPL-3; if not, see
>  <https://www.gnu.org/licenses/>.
> 
>-Files: debian/rules
>-Copyright: 2005 Uwe Steinmann.
>- 2015-2019 Univention GmbH
>-Licence: GPL-2
>-
> Files: src/build/libtool.m4
> Copyright: 1996-2001, 2003-2015 Free Software Foundation, Inc.
>  1996 Gordon Matzigkeit
>diff --git a/saml/php-krb5/debian/php-krb5.docs b/saml/php-krb5/debian/php-krb5.docs
>index d34f984592..0dad564792 100644
>--- a/saml/php-krb5/debian/php-krb5.docs
>+++ b/saml/php-krb5/debian/php-krb5.docs
>@@ -1,2 +1 @@
> src/README
>-src/CREDITS
>diff --git a/saml/php-krb5/debian/php-krb5.install b/saml/php-krb5/debian/php-krb5.install
>deleted file mode 100644
>index 9ff9843793..0000000000
>--- a/saml/php-krb5/debian/php-krb5.install
>+++ /dev/null
>@@ -1 +0,0 @@
>-krb5.ini etc/php/7.3/mods-available/
>diff --git a/saml/php-krb5/debian/php-krb5.php b/saml/php-krb5/debian/php-krb5.php
>new file mode 100644
>index 0000000000..6136c54f7b
>--- /dev/null
>+++ b/saml/php-krb5/debian/php-krb5.php
>@@ -0,0 +1,2 @@
>+mod src/modules/krb5.so
>+mod krb5.ini
>diff --git a/saml/php-krb5/debian/php-krb5.postinst b/saml/php-krb5/debian/php-krb5.postinst
>deleted file mode 100755
>index 5e58882565..0000000000
>--- a/saml/php-krb5/debian/php-krb5.postinst
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-#
>-# Copyright 2018-2020 Univention GmbH
>-#
>-# https://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# The source code of this program is made available
>-# under the terms of the GNU Affero General Public License version 3
>-# (GNU AGPL V3) as published by the Free Software Foundation.
>-#
>-# Binary versions of this program provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention and not subject to the GNU AGPL V3.
>-#
>-# In the case you use this program under the terms of the GNU AGPL V3,
>-# the program is provided in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>-# GNU Affero General Public License for more details.
>-#
>-# You should have received a copy of the GNU Affero General Public
>-# License with the Debian GNU/Linux or Univention distribution in file
>-# /usr/share/common-licenses/AGPL-3; if not, see
>-# <https://www.gnu.org/licenses/>.
>-
>-#DEBHELPER#
>-
>-if [ "$1" = "configure" ]; then
>-	phpenmod krb5
>-fi
>-
>-exit 0
>diff --git a/saml/php-krb5/debian/php-krb5.postrm b/saml/php-krb5/debian/php-krb5.postrm
>deleted file mode 100755
>index 4395819f5e..0000000000
>--- a/saml/php-krb5/debian/php-krb5.postrm
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-#
>-# Copyright 2018-2020 Univention GmbH
>-#
>-# https://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# The source code of this program is made available
>-# under the terms of the GNU Affero General Public License version 3
>-# (GNU AGPL V3) as published by the Free Software Foundation.
>-#
>-# Binary versions of this program provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention and not subject to the GNU AGPL V3.
>-#
>-# In the case you use this program under the terms of the GNU AGPL V3,
>-# the program is provided in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>-# GNU Affero General Public License for more details.
>-#
>-# You should have received a copy of the GNU Affero General Public
>-# License with the Debian GNU/Linux or Univention distribution in file
>-# /usr/share/common-licenses/AGPL-3; if not, see
>-# <https://www.gnu.org/licenses/>.
>-
>-#DEBHELPER#
>-
>-if [ "$1" = "remove" ]; then
>-	phpdismod krb5
>-fi
>-
>-exit 0
>diff --git a/saml/php-krb5/debian/rules b/saml/php-krb5/debian/rules
>index 45619f109c..a39afd8205 100755
>--- a/saml/php-krb5/debian/rules
>+++ b/saml/php-krb5/debian/rules
>@@ -1,28 +1,8 @@
> #!/usr/bin/make -f
>-# template debian/rules provided by dh-make-php.
>-# GNU copyright 2005 by Uwe Steinmann.
>-
>-# Uncomment this to turn on verbose mode.
> export DH_VERBOSE=1
> 
>-# This has to be exported to make some magic below work.
>-export DH_OPTIONS
>-
> TAR := krb5-1.1.3.tgz
> 
>-CFLAGS = -O2 -Wall
>-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
>-	CFLAGS += -g
>-	DEBUG := --enable-debug
>-else
>-	DEBUG := --disable-debug
>-endif
>-
>-PECL_PKG_NAME=krb5
>-BIN_PACKAGE_NAME=php-krb5
>-EXT_DIR=$(shell /usr/bin/php-config --extension-dir)
>-
> override_dh_auto_clean:
> 	$(RM) -r src
> 	install -d src
>@@ -33,12 +13,5 @@ override_dh_auto_configure:
> 	cd src && phpize
> 	dh_auto_configure
> 
>-override_dh_auto_install:
>-	mkdir -m 644 -p debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)
>-	install -m 644 -o root -g root src/modules$*/$(PECL_PKG_NAME).so debian/$(BIN_PACKAGE_NAME)/$(EXT_DIR)/$(PECL_PKG_NAME).so
>-
>-override_dh_auto_test:
>-	export NO_INTERACTION dh_auto_test
>-
> %:
>-	dh $@ --sourcedirectory=src
>+	dh $@ --sourcedirectory=src --with php
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 51472: 10386