Lintian Fixes - php8.1
Ready changes
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Use secure copyright file specification URI. ( insecure-copyright-format-uri )
- debian/copyright: use spaces rather than tabs to start continuation lines. ( tab-in-license-text )
- Move source package lintian overrides to debian/source. ( old-source-override-location )
- Update renamed lintian tag names in lintian overrides. ( renamed-tag )
- Set upstream metadata fields: Bug-Database, Repository-Browse. ( upstream-metadata-file-is-missing )
- Refer to specific version of license LGPL-3+. ( copyright-refers-to-symlink-license , copyright-refers-to-versionless-license-file )
- Drop unnecessary dh arguments: --with=systemd ( debian-rules-uses-unnecessary-dh-argument )
- Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP. ( uses-deprecated-adttmp )
- Avoid explicitly specifying -Wl,--as-needed linker flag. ( debian-rules-uses-as-needed-linker-flag )
Failed fixers:
- old-override-info-format
- homepage-field-uses-insecure-uri
- package-needs-versioned-debhelper-build-depends
- package-uses-deprecated-debhelper-compat-version
See the worker log for details.
Diff
diff --git a/debian/copyright b/debian/copyright
index 3ffd59514..3f58a7286 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: php
Upstream-Contact: https://bugs.php.net/
Source: http://php.net/downloads.php
@@ -52,7 +52,7 @@ License: Zend-Engine-2.00
Files: ext/phar/tar.c
Copyright: 2003-2007 Tim Kientzle
- 1999-2015 The PHP Group.
+ 1999-2015 The PHP Group.
License: BSD-2-clause
Files: sapi/fpm/*
@@ -61,17 +61,17 @@ License: BSD-2-clause
Files: ext/bcmath/libbcmath/*
Copyright: 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
- 2000 Philip A. Nelson
+ 2000 Philip A. Nelson
License: LGPL-2+
Files: ext/fileinfo/libmagic/*
Copyright: 1985-1995 Ian F. Darwin
- 1994-2009 Christos Zoulas <christos@zoulas.com>
+ 1994-2009 Christos Zoulas <christos@zoulas.com>
License: BSD-2-clause-libmagic
Files: ext/date/lib/*
Copyright: 2015-2017 Derick Rethans
- 2017 MongoDB, Inc.
+ 2017 MongoDB, Inc.
License: Expat
Files: ext/mbstring/libmbfl/*
@@ -88,8 +88,8 @@ License: PHP-3.01
Files: ext/standard/rand.c
Copyright: 1997-2002 Makoto Matsumoto and Takuji Nishimura,
- 2000-2003 Richard J. Wagner
- 1999-2015 The PHP Group.
+ 2000-2003 Richard J. Wagner
+ 1999-2015 The PHP Group.
License: BSD-3-clause and PHP-3.01
Files: ext/pdo_odbc/odbc_driver.c
@@ -418,7 +418,7 @@ License: LGPL-3+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
@@ -707,8 +707,8 @@ License: BSD-4-clause
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
4. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
diff --git a/debian/php-sapi.lintian-overrides b/debian/php-sapi.lintian-overrides
index a14482c8c..94b917c8d 100644
--- a/debian/php-sapi.lintian-overrides
+++ b/debian/php-sapi.lintian-overrides
@@ -11,12 +11,12 @@ libapache2-mod-php@PHP_VERSION@: apache2-module-does-not-ship-load-file libphp@P
libapache2-mod-php@PHP_VERSION@: embedded-library usr/lib/apache2/modules/libphp@PHP_VERSION@.so: file
libapache2-mod-php@PHP_VERSION@: non-standard-apache2-module-package-name libapache2-mod-php@PHP_VERSION@ != libapache2-libphp@PHP_VERSION@
libphp@PHP_VERSION@-embed: embedded-library usr/lib/libphp@PHP_VERSION@.so: file
-libphp@PHP_VERSION@-embed: ldconfig-symlink-missing-for-shlib usr/lib/libphp.so usr/lib/libphp@PHP_VERSION@.so libphp.so
+libphp@PHP_VERSION@-embed: lacks-versioned-link-to-shared-library usr/lib/libphp.so usr/lib/libphp@PHP_VERSION@.so libphp.so
libphp@PHP_VERSION@-embed: maintscript-calls-ldconfig postinst
libphp@PHP_VERSION@-embed: maintscript-calls-ldconfig postrm
-libphp@PHP_VERSION@-embed: package-must-activate-ldconfig-trigger usr/lib/libphp@PHP_VERSION@.so
+libphp@PHP_VERSION@-embed: lacks-ldconfig-trigger usr/lib/libphp@PHP_VERSION@.so
libphp@PHP_VERSION@-embed: package-name-doesnt-match-sonames libphp
-libphp@PHP_VERSION@-embed: shlib-without-versioned-soname usr/lib/libphp@PHP_VERSION@.so libphp.so
+libphp@PHP_VERSION@-embed: shared-library-lacks-version usr/lib/libphp@PHP_VERSION@.so libphp.so
php@PHP_VERSION@-cgi: embedded-library usr/bin/php-cgi@PHP_VERSION@: file
php@PHP_VERSION@-cgi: embedded-library usr/lib/cgi-bin/php@PHP_VERSION@: file
php@PHP_VERSION@-cli: embedded-library usr/bin/php@PHP_VERSION@: file
diff --git a/debian/rules b/debian/rules
index bf4f72cd2..4946971ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,7 +138,7 @@ ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
else
DEB_CFLAGS_MAINT_APPEND += -O0
endif
-DEB_CFLAGS_MAINT_APPEND += -Wall -pedantic -fsigned-char -fno-strict-aliasing
+DEB_CFLAGS_MAINT_APPEND += -Wall -pedantic -fsigned-char -fno-strict-aliasing
DEB_CFLAGS_MAINT_APPEND += $(shell getconf LFS_CFLAGS)
# OpenSSL 3.0 support
@@ -156,8 +156,6 @@ endif
# Enable producing of debugging information
DEB_CFLAGS_MAINT_APPEND += -g
-DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
export DEB_CFLAGS_MAINT_APPEND
export DEB_LDFLAGS_MAINT_APPEND
@@ -273,7 +271,7 @@ ext_config += $(foreach ext_ext,$(ext_EXTENSIONS),$($(ext_ext)_config))
#$(info Enabled config $(ext_config))
%:
- dh $@ --with systemd --with apache2 --without=build-stamp --without autoreconf $(PARALLEL)
+ dh $@ --with apache2 --without=build-stamp --without autoreconf $(PARALLEL)
PREPARE_FILES := $(addprefix debian/,$(shell cat debian/prepare-files))
diff --git a/debian/source.lintian-overrides b/debian/source/lintian-overrides
similarity index 100%
rename from debian/source.lintian-overrides
rename to debian/source/lintian-overrides
diff --git a/debian/tests/cli b/debian/tests/cli
index a3015772c..5bc17bd12 100644
--- a/debian/tests/cli
+++ b/debian/tests/cli
@@ -3,7 +3,7 @@ set -e
# Author: Robie Basak <robie.basak@ubuntu.com>
-cd "$ADTTMP"
+cd "$AUTOPKGTEST_TMP"
cat > hello.php <<EOT
<?php echo "Hello, world!\n"; ?>
EOT
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000000000..8a654b550
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/php/php-src/issues
+Repository-Browse: https://github.com/php/php-src
Run locally
More details
Historical runs
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files
- unexpected-local-upstream-changes: Tree has local changes: 7 files