diff --git a/debian/2775-dirs b/debian/2775-dirs deleted file mode 100644 index ad85adc..0000000 --- a/debian/2775-dirs +++ /dev/null @@ -1 +0,0 @@ -var/local 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 Fri, 03 May 2024 18:04:00 +0200 diff --git a/debian/README b/debian/README index 9ced2ea..16c7427 100644 --- a/debian/README +++ b/debian/README @@ -4,10 +4,10 @@ Frequently Asked Questions about base-files * Questions about /etc/issue and /etc/debian_version: Q. I upgraded my system to the testing distribution and now my /etc/issue -says "trixie/sid". Should it not read "trixie" or "testing"? +says "forky/sid". Should it not read "forky" or "testing"? Q. I upgraded my system to the unstable distribution and now my /etc/issue -says "trixie/sid". Should it not read "sid" or "unstable"? +says "forky/sid". Should it not read "sid" or "unstable"? A. That would be nice, but it is not possible because of the way the testing distribution works. Packages uploaded for unstable reach @@ -17,9 +17,9 @@ testing. You should consider the testing and unstable distributions as two sides of the same coin. Since the base-files package in testing was initially uploaded for unstable, the only sensible /etc/issue to have is one that is both valid for testing and unstable, hence -"trixie/sid" (or whatever is appropriate). +"forky/sid" (or whatever is appropriate). -Q. Why "trixie/sid" and not "testing/unstable" as it used to be? +Q. Why "forky/sid" and not "testing/unstable" as it used to be? A. The codename is a little bit more informative, as the meaning of "testing" changes over time. @@ -31,7 +31,7 @@ not a reliable way to know that anymore. Looking at the contents of your /etc/apt/sources.list file is probably a much better way. Q. There is a new point release and I've just upgraded my system. -The /etc/debian_version file now says 10.x but /etc/issue still says 10. +The /etc/debian_version file now says 13.x but /etc/issue still says 13. Is this ok? A. Yes. The release managers asked me not to touch /etc/issue, as that's @@ -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 diff --git a/debian/base-files.dirs b/debian/base-files.dirs index b646146..d0769e4 100644 --- a/debian/base-files.dirs +++ b/debian/base-files.dirs @@ -1,4 +1,3 @@ -bin boot dev etc @@ -8,19 +7,14 @@ etc/profile.d etc/skel etc/update-motd.d home -lib proc root run -sbin sys tmp usr -usr/bin usr/games usr/include -usr/lib -usr/sbin usr/share usr/share/base-files usr/share/common-licenses diff --git a/debian/base-files.links b/debian/base-files.links index 3166652..3dd0249 100644 --- a/debian/base-files.links +++ b/debian/base-files.links @@ -1,4 +1,4 @@ -usr/share/doc/base-files/README usr/share/doc/base-files/FAQ +usr/share/doc/base-files/README usr/share/doc/base-files/FAQ usr/share/common-licenses/GFDL-1.3 usr/share/common-licenses/GFDL usr/share/common-licenses/LGPL-3 usr/share/common-licenses/LGPL usr/share/common-licenses/GPL-3 usr/share/common-licenses/GPL diff --git a/debian/base-files.lintian-overrides b/debian/base-files.lintian-overrides index 691e9e6..00b1870 100644 --- a/debian/base-files.lintian-overrides +++ b/debian/base-files.lintian-overrides @@ -20,3 +20,24 @@ base-files: extra-license-file [usr/share/common-licenses/GPL-3] base-files: extra-license-file [usr/share/common-licenses/LGPL-2] base-files: extra-license-file [usr/share/common-licenses/LGPL-2.1] base-files: extra-license-file [usr/share/common-licenses/LGPL-3] +# +# These links really should be relative. +# +base-files: relative-symlink usr/bin [bin] +base-files: relative-symlink usr/lib [lib] +base-files: relative-symlink usr/lib64 [lib64] +base-files: relative-symlink usr/libx32 [libx32] +base-files: relative-symlink usr/sbin [sbin] +# +# We need these for the relevant architectures. +# +base-files: non-multi-arch-lib-dir [usr/lib64/] +base-files: non-multi-arch-lib-dir [usr/libx32/] +# +# The following directories have become symlinks. +# +base-files: file-in-unusual-dir [bin] +base-files: file-in-unusual-dir [lib64] +base-files: file-in-unusual-dir [lib] +base-files: file-in-unusual-dir [libx32] +base-files: file-in-unusual-dir [sbin] diff --git a/debian/changelog b/debian/changelog index b1b8035..f9db612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,26 +1,102 @@ -base-files (1:1.3) unstable; urgency=medium +base-files (1:2.0) unstable; urgency=medium - * 1.3 point release + * Initial release for Sauropod - -- Aleksey Samoilov Sat, 24 May 2025 14:39:04 +0400 + -- Aleksey Samoilov Tue, 27 May 2025 19:58:55 +0400 -base-files (1:1.2) unstable; urgency=medium +base-files (13.8) unstable; urgency=medium - * 1.2 point release + * Changes for trixie as stable: + - Use 13 as version in /etc/issue and /etc/issue.net. + - Use 13.0 as version in /etc/debian_version. + - Update PRETTY_NAME in os-release, now 13 (trixie). + - Add VERSION_ID and VERSION. + - Add DEBIAN_VERSION_FULL with the same contents as /etc/debian_version. + This is only expected to exist on stable releases. Closes: #931197. + Note that this does not change the fundamental fact that "all point + releases of trixie are Debian 13". This is just a convenience for + tools like ansible who already parse both debian_version and os-release + so that in the long term they can parse os-release only. + - Update README (trixie -> forky and use 13.x for example version). + * Refresh some licenses from ftp.gnu.org. Closes: #1103289. + * Set Rules-Requires-Root to no. + * Drop obsolete debian/2775-dirs. + * Add Vcs-Git and Vcs-Browser fields. - -- Aleksey Samoilov Thu, 24 Oct 2024 22:38:34 +0400 + -- Santiago Vila Mon, 12 May 2025 21:25:00 +0200 -base-files (1:1.1) unstable; urgency=medium +base-files (13.7) unstable; urgency=medium - * 1.1 point release + * Make /var/local to be root:root and 755 by default on new installs. + On upgrades from Debian 12, the permissions of /var/local are kept, + which is what we want for backwards compatibility. Closes: #1039973. + * Raise Standards-Version to 4.7.2. + * Add debian/salsa-ci.yml. - -- Aleksey Samoilov Sat, 15 Jun 2024 16:13:06 +0400 + -- Santiago Vila Tue, 04 Mar 2025 12:20:00 +0100 -base-files (1:1.0) unstable; urgency=medium +base-files (13.6) unstable; urgency=medium - * Adapt to TileOS + * Change default dot.profile to not use mesg anymore. Closes: #1088011. - -- Aleksey Samoilov Sun, 07 May 2023 21:13:28 +0400 + -- Santiago Vila Fri, 22 Nov 2024 15:40:00 +0100 + +base-files (13.5) unstable; urgency=medium + + [ Chris Hofstaedtler ] + * Fix typo in preinst: lib64 -> libx32. Closes: #1077863. + [ Helmut Grohne ] + * Work around /lib64 link created by systemd-nspawn. Closes: #1077866. + [ Santiago Vila ] + * Add lintian overrides for the directories that have become symlinks. + + -- Santiago Vila Sun, 04 Aug 2024 23:30:00 +0200 + +base-files (13.4) unstable; urgency=medium + + [ Helmut Grohne ] + * Tighten the merged-/usr preinst check. Closes: #1076491. + [ Santiago Vila ] + * Raise Standards-Version to 4.7.0. + + -- Santiago Vila Thu, 01 Aug 2024 12:30:00 +0200 + +base-files (13.3) unstable; urgency=medium + + [ Helmut Grohne ] + * DEP17: Install /usr-merge aliasing symlinks. Closes: #1064459. + + -- Santiago Vila Thu, 06 Jun 2024 00:35:00 +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 Fri, 03 May 2024 18:15:00 +0200 + +base-files (13.1) unstable; urgency=medium + + * Rename postinst.in to postinst. Use dh_installdeb token feature instead. + * Add /usr/local/libexec. Closes: #994220. + * Machine-readable copyright file. Closes: #1020828. + * Add a debian/gbp.conf file. + + -- Santiago Vila Wed, 17 Apr 2024 12:45:00 +0200 + +base-files (13) unstable; urgency=medium + + * Change issue, issue.net, debian_version and os-release + to read "trixie/sid". + * Change VERSION_CODENAME in os-release to read "trixie". + * Drop VERSION and VERSION_ID from os-release. + + -- Santiago Vila Sun, 11 Jun 2023 17:00:00 +0200 base-files (12.4) unstable; urgency=medium diff --git a/debian/clean b/debian/clean index ccba3ce..b4ac698 100644 --- a/debian/clean +++ b/debian/clean @@ -1 +1 @@ -debian/postinst +debian/triggers diff --git a/debian/control b/debian/control index 0b13a93..086f7c1 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,14 @@ Source: base-files Section: admin Priority: required Maintainer: Aleksey Samoilov -Standards-Version: 4.6.2 +Standards-Version: 4.7.2 Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~) -Rules-Requires-Root: binary-targets +Vcs-Git: https://git.tile-os.com/TileOS/base-files.git +Vcs-Browser: https://git.tile-os.com/TileOS/base-files +Rules-Requires-Root: no Package: base-files -Provides: base +Provides: base, usr-is-merged Architecture: any Pre-Depends: awk Depends: ${misc:Depends} diff --git a/debian/copyright b/debian/copyright index 3f5ed9b..a971207 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,28 +1,37 @@ -This is the Debian prepackaged version of the Debian Base System -Miscellaneous files. These files were written by Ian Murdock - and Bruce Perens . +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Comment: + This is the Debian prepackaged version of the Debian Base System + Miscellaneous files. These files were written by Ian Murdock + and Bruce Perens . + . + This package was first put together by Bruce Perens , + from his own sources. -This package was first put together by Bruce Perens , -from his own sources. +Files: * +Copyright: (C) 1995-2011 Software in the Public Interest +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed 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 General Public License for more details. + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. +Comment: + The Artistic License in /usr/share/common-licenses is the one coming + from Perl and its SPDX name is "Artistic License 1.0 (Perl)". -The GNU Public Licenses in /usr/share/common-licenses were taken from -ftp.gnu.org and are copyrighted by the Free Software Foundation, Inc. - -The Artistic License in /usr/share/common-licenses is the one coming -from Perl and its SPDX name is "Artistic License 1.0 (Perl)". - - -Copyright (C) 1995-2011 Software in the Public Interest. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed 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 General Public License for more details. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Files: licenses/GFDL-* + licenses/GPL-* + licenses/LGPL-* +Copyright: 1989-2008 Free Software Foundation, Inc. +License: verbatim + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. +Comment: + The GNU licenses in /usr/share/common-licenses were taken from ftp.gnu.org. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..6f74a48 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +upstream-branch = master +debian-branch = master +debian-tag = %(version)s diff --git a/debian/postinst.in b/debian/postinst similarity index 81% rename from debian/postinst.in rename to debian/postinst index 0ad4ce3..e1ad3a4 100644 --- a/debian/postinst.in +++ b/debian/postinst @@ -83,6 +83,7 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then install_local_dir /usr/local/bin install_local_dir /usr/local/games install_local_dir /usr/local/lib + install_local_dir /usr/local/libexec install_local_dir /usr/local/include install_local_dir /usr/local/sbin install_local_dir /usr/local/src @@ -106,3 +107,27 @@ if [ "$1" = "configure" ] && [ "$2" != "" ]; then install_directory mnt 755 root fi fi + +rtlddir="#USR_MERGE_RTLDLIB#" +if [ "$1" = "configure" ] && [ -n "$rtlddir" ]; then + # Remove temporary DEP17 M4 diversion added by glibc. + dpkg-divert --quiet --package base-files --remove --no-rename --divert "/.$rtlddir.usr-is-merged" "/$rtlddir" +fi + +if [ "$1" = "configure" ] || [ "$1" = "triggered" ]; then + for d in #USR_MERGE_MULTILIB#; do + if [ -d "$DPKG_ROOT/usr/$d" ]; then + if [ -L "$DPKG_ROOT/$d" ]; then + : + elif [ -d "$DPKG_ROOT/$d" ]; then + echo "Warning: /$d is not a symlink, but should be." 1>&2 + else + ln -s "usr/$d" "$DPKG_ROOT/$d" + fi + elif [ -L "$DPKG_ROOT/$d" ]; then + rm "$DPKG_ROOT/$d" + fi + done +fi + +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..402c738 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ]; then + for d in #USR_MERGE_MULTILIB#; do + # Remove DEP17 M4 protective diversions + dpkg-divert --quiet --package base-files --remove --no-rename --divert "/.$d.usr-is-merged" "/$d" + done +fi + +#DEBHELPER# diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..de5b1f1 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,55 @@ +#!/bin/sh +set -e + +if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then + msg= + for d in bin lib lib32 lib64 libo32 libx32 sbin; do + if [ -L "$DPKG_ROOT/$d" ]; then + target=$(readlink "$DPKG_ROOT/$d") + if [ "$target" != "usr/$d" ]; then + if [ "$d" = lib64 ] && [ "$target" = "usr/lib/#DEB_HOST_MULTIARCH#" ]; then + # Work around https://github.com/systemd/systemd/issues/33919 + echo "Fixing bad /$d symbolic link created by systemd-nspawn." + if [ -d "$DPKG_ROOT/usr/$d" ]; then + ln -sf "usr/$d" "$DPKG_ROOT/$d" + else + rm "$DPKG_ROOT/$d" + fi + else + msg="/$d is a symbolic link and not pointing at usr/$d exactly" + fi + elif [ ! -d "$DPKG_ROOT/usr/$d" ]; then + msg="/$d is a dangling symbolic link" + fi + msg2="This is an unexpected situation. Cannot proceed with the upgrade" + elif [ -d "$DPKG_ROOT/$d" ]; then + msg="/$d is a directory, but should be a symbolic link" + msg2="Please install the usrmerge package to convert this system to merged-/usr" + fi + if [ -n "$msg" ]; then + cat < debian/postinst + sh debian/check-md5sum-etc dot.profile + set -e; { \ + echo "# Triggers for creating multilib aliasing symlinks on demand"; \ + for d in $(USR_MERGE_MULTILIB); do \ + echo "interest-noawait /usr/$$d"; \ + done; \ + } > debian/triggers + +execute_after_dh_installdirs: + dh_installdirs $(foreach d,$(USR_MERGE),usr/$(d)) override_dh_auto_install: install -p -m 644 etc/* $(DESTDIR)/etc @@ -40,14 +62,22 @@ override_dh_installchangelogs: override_dh_link: dh_link -X os-release + # We want these links to be relative, so we cannot use dh_link. + set -e; for d in $(USR_MERGE); do \ + ln -s usr/$$d debian/base-files/$$d; \ + done override_dh_compress: dh_compress -X README override_dh_fixperms: dh_fixperms - cd debian/base-files && chown root:staff var/local cd debian/base-files && chmod 755 `find . -type d` cd debian/base-files && chmod 1777 `cat ../1777-dirs` - cd debian/base-files && chmod 2775 `cat ../2775-dirs` cd debian/base-files && chmod 700 root + +override_dh_installdeb: + dh_installdeb \ + '-DVENDORFILE=$(VENDORFILE)' \ + '-DUSR_MERGE_MULTILIB=$(USR_MERGE_MULTILIB)' \ + '-DUSR_MERGE_RTLDLIB=$(USR_MERGE_RTLDLIB)' diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..8424db4 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,3 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml diff --git a/debian/timestamps b/debian/timestamps new file mode 100644 index 0000000..214d9d0 --- /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 "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 "2022-02-10 06:14:38 UTC" licenses/GFDL-1.3 +touch -d "2024-09-18 13:56:22 UTC" licenses/GFDL-1.2 +touch -d "2024-09-18 14:33:26 UTC" licenses/GPL-1 +touch -d "2024-09-18 14:33:27 UTC" licenses/GPL-2 +touch -d "2024-09-18 14:33:28 UTC" licenses/LGPL-2 +touch -d "2024-09-18 14:33:29 UTC" licenses/LGPL-2.1 diff --git a/etc/debian_version b/etc/debian_version index 1583a4b..f075061 100644 --- a/etc/debian_version +++ b/etc/debian_version @@ -1 +1 @@ -12.11 +13.0 diff --git a/etc/issue b/etc/issue index 7fe35db..364957a 100644 --- a/etc/issue +++ b/etc/issue @@ -1,2 +1,2 @@ -TileOS 1.3 T-Rex \n \l +TileOS 2.0 Sauropod \n \l diff --git a/etc/issue.net b/etc/issue.net index bccea16..bcf7ed5 100644 --- a/etc/issue.net +++ b/etc/issue.net @@ -1 +1 @@ -TileOS 1.3 T-Rex +TileOS 2.0 Sauropod diff --git a/etc/os-release b/etc/os-release index c8e801c..a806e19 100644 --- a/etc/os-release +++ b/etc/os-release @@ -1,11 +1,11 @@ -PRETTY_NAME="TileOS 1.3 (t-rex)" +PRETTY_NAME="TileOS 2.0 (sauropod)" NAME="TileOS" -VERSION_ID="1.3" -VERSION="1.3 (t-rex)" -VERSION_CODENAME=t-rex +VERSION_ID="2.0" +VERSION="2.0 (sauropod)" +VERSION_CODENAME=sauropod +DEBIAN_VERSION_FULL=13.0 ID=tileos ID_LIKE=debian -VERSION_CODENAME=t-rex -DEBIAN_CODENAME=bookworm -SUPPORT_URL="https://github.com/Tile-OS/TileOS" -BUG_REPORT_URL="https://github.com/Tile-OS/TileOS/issues" +HOME_URL="https://tile-os.com" +SUPPORT_URL="https://git.tile-os.com/TileOS/tileos" +BUG_REPORT_URL="https://git.tile-os.com/TileOS/tileos/issues" diff --git a/licenses/GFDL-1.2 b/licenses/GFDL-1.2 index 68d93f4..d897927 100644 --- a/licenses/GFDL-1.2 +++ b/licenses/GFDL-1.2 @@ -3,7 +3,7 @@ Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/licenses/GPL-1 b/licenses/GPL-1 index 8de98af..644cdbd 100644 --- a/licenses/GPL-1 +++ b/licenses/GPL-1 @@ -3,7 +3,7 @@ Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -217,8 +217,7 @@ the exclusion of warranty; and each file should have at least the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + along with this program; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -245,7 +244,7 @@ necessary. Here a sample; alter the names: program `Gnomovision' (a program to direct compilers to make passes at assemblers) written by James Hacker. - , 1 April 1989 - Ty Coon, President of Vice + , 1 April 1989 + Moe Ghoul, President of Vice That's all there is to it! diff --git a/licenses/GPL-2 b/licenses/GPL-2 index d159169..9efa6fb 100644 --- a/licenses/GPL-2 +++ b/licenses/GPL-2 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + with this program; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -329,8 +328,8 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1989 - Ty Coon, President of Vice + , 1 April 1989 + Moe Ghoul, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may diff --git a/licenses/LGPL-2 b/licenses/LGPL-2 index 12735e6..ede5d54 100644 --- a/licenses/LGPL-2 +++ b/licenses/LGPL-2 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -463,8 +463,7 @@ convey the exclusion of warranty; and each file should have at least the Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -475,7 +474,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. - , 1 April 1990 - Ty Coon, President of Vice + , 1 April 1990 + Moe Ghoul, President of Vice That's all there is to it! diff --git a/licenses/LGPL-2.1 b/licenses/LGPL-2.1 index 4362b49..f6683e7 100644 --- a/licenses/LGPL-2.1 +++ b/licenses/LGPL-2.1 @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -496,7 +495,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. - , 1 April 1990 - Ty Coon, President of Vice + , 1 April 1990 + Moe Ghoul, President of Vice That's all there is to it! 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/dot.profile b/share/dot.profile index c4c7402..bc300dd 100644 --- a/share/dot.profile +++ b/share/dot.profile @@ -5,5 +5,3 @@ if [ "$BASH" ]; then . ~/.bashrc fi fi - -mesg n 2> /dev/null || true diff --git a/share/dot.profile.md5sums b/share/dot.profile.md5sums index 4a8e261..33de137 100644 --- a/share/dot.profile.md5sums +++ b/share/dot.profile.md5sums @@ -1,2 +1,4 @@ 54328f6b27a45c51986ed436f3f609bf 8 46438b614dcb2175148fa7e0bdc604a4 9.3 +d68ce7c7d7d2bb7d48aeb2f137b828e4 11 +04fd980ef599a6d7bfd5dc5454421795 13.6 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