diff options
-rw-r--r-- | debian/NEWS | 9 | ||||
-rw-r--r-- | debian/README | 7 | ||||
-rw-r--r-- | debian/changelog | 74 | ||||
-rw-r--r-- | debian/postinst | 2 | ||||
-rwxr-xr-x | debian/rules | 3 | ||||
-rw-r--r-- | debian/timestamps | 21 | ||||
-rw-r--r-- | share/dot.bashrc | 5 | ||||
-rw-r--r-- | share/profile | 2 | ||||
-rw-r--r-- | share/profile.md5sums | 3 |
9 files changed, 122 insertions, 4 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..285c231 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,9 @@ +base-files (13.2) unstable; urgency=medium + + By default, snippets for Bourne and Bourne-compatible shells (*.sh) + in /etc/profile.d will only be sourced by /etc/profile if they + conform to a sensible regexp including only some ASCII characters, + as it already happens with cron entries and the like. Previously, + the behaviour was not really well defined. + + -- Santiago Vila <sanvila@debian.org> Fri, 03 May 2024 18:04:00 +0200 diff --git a/debian/README b/debian/README index 9ced2ea..9cc76c8 100644 --- a/debian/README +++ b/debian/README @@ -95,5 +95,12 @@ freedom to remove those directories without them being created again when base-files is upgraded. Therefore, if you are running any sort of compliance tests, you should do it on newly installed systems only. +Q. My system (when I do "dpkg -s base-files") shows /etc/profile as +an "obsolete conffile". Is this ok? + +A. Yes. The file was handled by base-files as a conffile in the dpkg sense +in the past, so dpkg may consider the file as an obsolete conffile. +There is currently not a way to tell dpkg to unregister it as a conffile +without removing it, so the best approach for now is to do nothing about it. Santiago Vila <sanvila@debian.org> diff --git a/debian/changelog b/debian/changelog index 44bd6e6..dc5dbff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +base-files (13.2-0.0~progress7.99u1) graograman-backports; urgency=medium + + * Uploading to graograman-updates, remaining changes: + - Updating maintainer field. + - Updating uploaders field. + - Updating bugs field. + - Updating vcs fields. + - Updating source format. + - Adding issue files for Progress Linux. + - Adding motd file for Progress Linux. + - Adding os-release file for Progress Linux 7.99 (graograman-backports). + - Adding derivative version file for Progress Linux 7.99 (graograman- + backports). + - Adding dpkg origin file for Progress Linux. + - Adding lsb release file for Progress Linux 7.99 (graograman- + backports). + - Adding internal preseed option to select os identification. + - Adding bashrc for Progress Linux. + - Including bash configuration files for Progress Linux. + - Adding bash configuration. + - Adding coreutils aliases. + - Adding git prompt. + - Adding grep aliases. + - Adding iproute2 aliases. + - Adding less aliases. + - Adding locales fallback. + * Merging upstream version 13.2. + * Merging debian version 13.2. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 04 May 2024 03:02:19 +0200 + +base-files (13.2) unstable; urgency=medium + + * Document that /etc/profile is not a conffile anymore. Closes: #868095. + * Use a regexp to source files in /etc/profile.d. The behaviour should now be + well defined and consistent. Closes: #885414, #1069279. + * Add NEWS.Debian entry for the above. + * Document that the default umask is defined in /etc/login.defs. Closes: #983606. + * Add #DEBHELPER# token to postinst to make lintian happy. + * Make binary package to be git-reproducible. + + -- Santiago Vila <sanvila@debian.org> Fri, 03 May 2024 18:15:00 +0200 + +base-files (13.1-0.0~progress7.99u1) graograman-backports; urgency=medium + + * Uploading to graograman-updates, remaining changes: + - Updating maintainer field. + - Updating uploaders field. + - Updating bugs field. + - Updating vcs fields. + - Updating source format. + - Adding issue files for Progress Linux. + - Adding motd file for Progress Linux. + - Adding os-release file for Progress Linux 7.99 (graograman-backports). + - Adding derivative version file for Progress Linux 7.99 (graograman- + backports). + - Adding dpkg origin file for Progress Linux. + - Adding lsb release file for Progress Linux 7.99 (graograman- + backports). + - Adding internal preseed option to select os identification. + - Adding bashrc for Progress Linux. + - Including bash configuration files for Progress Linux. + - Adding bash configuration. + - Adding coreutils aliases. + - Adding git prompt. + - Adding grep aliases. + - Adding iproute2 aliases. + - Adding less aliases. + - Adding locales fallback. + * Merging upstream version 13.1. + * Merging debian version 13.1. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 17 Apr 2024 13:47:27 +0200 + base-files (13.1) unstable; urgency=medium * Rename postinst.in to postinst. Use dh_installdeb token feature instead. diff --git a/debian/postinst b/debian/postinst index d7bf2bc..573214f 100644 --- a/debian/postinst +++ b/debian/postinst @@ -147,3 +147,5 @@ case "${1}" in esac ;; esac + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index 6b62db0..5287a69 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,9 @@ DESTDIR = debian/base-files %: dh $@ +execute_after_dh_clean: + sh debian/timestamps + override_dh_auto_build: sh debian/check-md5sum-etc profile diff --git a/debian/timestamps b/debian/timestamps new file mode 100644 index 0000000..1c92569 --- /dev/null +++ b/debian/timestamps @@ -0,0 +1,21 @@ +#!/bin/sh +set -e +BUILD_DATE=$(dpkg-parsechangelog -S Date) +touch -d "${BUILD_DATE}" etc/* +touch -d "${BUILD_DATE}" motd/* +touch -d "${BUILD_DATE}" origins/* +touch -d "${BUILD_DATE}" share/* +touch -d "1996-12-16 02:58:50 UTC" licenses/Artistic +touch -d "1999-08-26 12:06:20 UTC" licenses/BSD +touch -d "2004-12-19 20:30:25 UTC" licenses/Apache-2.0 +touch -d "2010-03-23 23:34:05 UTC" licenses/GPL-1 +touch -d "2010-03-23 23:34:05 UTC" licenses/GPL-2 +touch -d "2010-03-23 23:34:05 UTC" licenses/LGPL-2.1 +touch -d "2017-04-03 11:00:00 UTC" licenses/MPL-1.1 +touch -d "2017-04-03 20:00:00 UTC" licenses/MPL-2.0 +touch -d "2017-04-25 22:26:15 UTC" licenses/CC0-1.0 +touch -d "2017-09-30 07:14:21 UTC" licenses/GPL-3 +touch -d "2017-09-30 07:14:21 UTC" licenses/LGPL-3 +touch -d "2017-09-30 07:15:28 UTC" licenses/GFDL-1.2 +touch -d "2022-02-10 06:14:38 UTC" licenses/GFDL-1.3 +touch -d "2022-02-10 06:14:38 UTC" licenses/LGPL-2 diff --git a/share/dot.bashrc b/share/dot.bashrc index df9ee74..db632b8 100644 --- a/share/dot.bashrc +++ b/share/dot.bashrc @@ -1,7 +1,8 @@ # ~/.bashrc: executed by bash(1) for non-login shells. -# Note: PS1 and umask are already set in /etc/profile. You should not -# need this unless you want different defaults for root. +# Note: PS1 is set in /etc/profile, and the default umask is defined +# in /etc/login.defs. You should not need this unless you want different +# defaults for root. # PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ ' # umask 022 diff --git a/share/profile b/share/profile index de64c87..a897491 100644 --- a/share/profile +++ b/share/profile @@ -25,7 +25,7 @@ if [ "${PS1-}" ]; then fi if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do + for i in $(run-parts --list --regex '^[a-zA-Z0-9_][a-zA-Z0-9._-]*\.sh$' /etc/profile.d); do if [ -r $i ]; then . $i fi diff --git a/share/profile.md5sums b/share/profile.md5sums index 5d338c7..a1d0941 100644 --- a/share/profile.md5sums +++ b/share/profile.md5sums @@ -12,4 +12,5 @@ b94c2e3df2a779ac12080942df4d86ea 5.9 to 6.4 6c56009f8aabda9400878ce3c7fd91af 7.7 ff2bae0480885c074afadec201f5c668 7.8 to 9.5 2255054e61cee1a99dbe893377820dde 9.6 to 11 -48a30a427d1794feb49f102b87ddce2b 11.1 to current +48a30a427d1794feb49f102b87ddce2b 11.1 to 13.1 +be6a0f27688b15faede8ad38300c1acc 13.2 to current |