diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/700-dirs | 1 | ||||
-rw-r--r-- | debian/README | 23 | ||||
-rw-r--r-- | debian/changelog | 155 | ||||
-rw-r--r-- | debian/check-etc-profile-md5sum | 7 | ||||
-rw-r--r-- | debian/control | 8 | ||||
-rwxr-xr-x | debian/current-md5sums-obsolete (renamed from debian/current-md5sums) | 0 | ||||
-rw-r--r-- | debian/directory-list | 2 | ||||
-rw-r--r-- | debian/lintian | 5 | ||||
-rw-r--r-- | debian/postinst.in | 12 | ||||
-rwxr-xr-x | debian/rules | 14 |
10 files changed, 175 insertions, 52 deletions
diff --git a/debian/700-dirs b/debian/700-dirs deleted file mode 100644 index d8649da..0000000 --- a/debian/700-dirs +++ /dev/null @@ -1 +0,0 @@ -root diff --git a/debian/README b/debian/README index d1c61eb..962154f 100644 --- a/debian/README +++ b/debian/README @@ -9,15 +9,15 @@ says "wheezy/sid". Should it not read "wheezy" or "testing"? Q. I upgraded my system to the unstable distribution and now my /etc/issue says "wheezy/sid". Should it not read "sid" or "unstable"? -A. You obviously do not understand how the testing distribution works. -Packages uploaded for unstable reach testing after ten days, provided -they are built for every released architecture, have no RC-bugs and -their dependencies may be met in 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 "wheezy/sid" (or whatever is -appropriate). +A. That would be nice, but it is not possible because of the way the +testing distribution works. Packages uploaded for unstable reach +testing after ten days, provided they are built for every released +architecture, have no RC-bugs and their dependencies may be met in +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 +"wheezy/sid" (or whatever is appropriate). Q. Why "wheezy/sid" and not "testing/unstable" as it used to be? @@ -57,6 +57,11 @@ and you will see how they are created and where their master copies are: So, if you want your system to be as similar as possible to a newly installed squeeze system, you might want to sync these files manually. +Note 1: Since base-files version 6.10, /etc/profile is automatically +upgraded if it has not been modified from a previous default. + +Note 2: The file /etc/nsswitch.conf is going to be moved to libc-bin. + Q. Why isn't license "foo" included in common-licenses? diff --git a/debian/changelog b/debian/changelog index 1fbb98b..a1eda00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,45 +1,151 @@ -base-files (6.5ubuntu12+linaro13.04) quantal; urgency=low +base-files (6.12ubuntu2+linaro13.04) raring; urgency=low * Update Linaro Engineering Builds version to 13.04 + * Update debian/control: set Maintainer to Linaro Packagers + * Update debian/update-motd.d/10-help-text: set URL to wiki.linaro.org + * Update etc/issue and etc/issue.net: set to Linaro 13.04 + * Update etc/legal: replace Ubuntu by Linaro + * Update etc/lsb-release and etc/os-release: set variables to Linaro 13.04 + * Add origins/linaro file - -- Fathi Boudra <fathi.boudra@linaro.org> Sat, 20 Apr 2013 10:39:26 +0300 + -- Fathi Boudra <fathi.boudra@linaro.org> Sun, 05 May 2013 19:38:20 +0300 -base-files (6.5ubuntu12+linaro13.03) quantal; urgency=low +base-files (6.12ubuntu2) raring; urgency=low - * Update Linaro Engineering Builds version to 13.03 + * /etc/issue, /etc/issue.net, /etc/lsb-release, /etc/os-release: Prepare + for Raring release. - -- Fathi Boudra <fathi.boudra@linaro.org> Sat, 23 Mar 2013 09:36:12 +0200 + -- Colin Watson <cjwatson@ubuntu.com> Fri, 19 Apr 2013 09:52:03 +0100 -base-files (6.5ubuntu12+linaro13.02) quantal; urgency=low +base-files (6.12ubuntu1) raring; urgency=low - * Update Linaro Engineering Builds version to 13.02 + * Merge from Debian unstable. Remaining changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Various bashrc extensions. + - Do not install /usr/local dirs with staff group writeability, as there + are cases where somebody can become any user but root (like NFS). + - Update the motd upgrade handling to know about /etc/motd.tail. + - Add default /etc/networks file. + - Added information about the docs web page. + - Restore order line in /etc/host.conf with a comment. + - Add update-motd scripts. + - Migrate /etc/os-release to a conffile. + * Add HOME_URL, SUPPORT_URL, and BUG_REPORT_URL to /etc/os-release. - -- Fathi Boudra <fathi.boudra@linaro.org> Fri, 22 Feb 2013 08:28:42 +0200 + -- Adam Conrad <adconrad@ubuntu.com> Mon, 29 Oct 2012 17:53:44 +0000 -base-files (6.5ubuntu12+linaro13.01) quantal; urgency=low +base-files (6.12) unstable; urgency=low - * Update Linaro Engineering Builds version to 13.01 + * Added HOME_URL, SUPPORT_URL and BUG_REPORT_URL to /etc/os-release. + Reported by Raphaƫl Hertzog. Closes: #681480. + * Added Breaks: sendfile (<< version in squeeze) to help sendfile bug + regarding improper modification of /etc/profile to be fixed faster. + Reported by Andreas Beckmann. Closes: #689835. + * Make /var/run and /var/lock absolute again. + Reported by Roger Leigh. Closes: #690345. - -- Fathi Boudra <fathi.boudra@linaro.org> Fri, 25 Jan 2013 11:09:02 +0200 + -- Santiago Vila <sanvila@debian.org> Sat, 27 Oct 2012 17:41:00 +0200 -base-files (6.5ubuntu12+linaro12.12) quantal; urgency=low +base-files (6.11ubuntu3) raring; urgency=low - * Update Linaro Engineering Builds version to 12.12 - * Update debian/control: set Maintainer to Linaro Packagers - * Update debian/update-motd.d/10-help-text: set URL to wiki.linaro.org - * Update etc/issue and etc/issue.net: set to Linaro 12.12 - * Update etc/legal: replace Ubuntu by Linaro - * Update etc/lsb-release and etc/os-release: set variables to Linaro 12.12 - * Add origins/linaro file + * Tighten up the preinst /etc/os-release migration version check to + make sure we don't try to re-migrate (and delete) the SRU version + from quantal-proposed, which now includes the conffile migration. + + -- Adam Conrad <adconrad@ubuntu.com> Tue, 23 Oct 2012 21:36:16 +0100 - -- Fathi Boudra <fathi.boudra@linaro.org> Sat, 15 Dec 2012 10:02:01 +0200 +base-files (6.11ubuntu2) raring; urgency=low -base-files (6.5ubuntu12) quantal; urgency=low + * Add preinst magic to silently migrate /etc/os-release to a conffile. - * Remove leap-second hack, which causes issues on some VMs: LP: #1022198 - * Migrate /etc/os-release to a conffile, see LP: #947236 for rationale. + -- Adam Conrad <adconrad@ubuntu.com> Tue, 23 Oct 2012 12:05:20 +0100 - -- Adam Conrad <adconrad@ubuntu.com> Tue, 23 Oct 2012 11:16:32 +0100 +base-files (6.11ubuntu1) raring; urgency=low + + * /etc/issue{,.net}, /etc/lsb-release, /etc/os-release: Welcome to Raring! + * Merge from Debian unstable. Remaining changes: + - Branding changes. + - Add /etc/lsb-release file. + - Add lsb-release-udeb package. + - Various bashrc extensions. + - Do not install /usr/local dirs with staff group writeability, as there + are cases where somebody can become any user but root (like NFS). + - Update the motd upgrade handling to know about /etc/motd.tail. + - Add default /etc/networks file. + - Added information about the docs web page. + - Restore order line in /etc/host.conf with a comment. + - Add update-motd scripts. + * Drop the outdated replaces on an ancient pre-hardy lsb-release + * Drop the temporary leap-second workaround, no longer needed + + -- Adam Conrad <adconrad@ubuntu.com> Mon, 22 Oct 2012 16:57:35 +0100 + +base-files (6.11) unstable; urgency=medium + + * Create /etc/motd instead of /etc/motd.tail, with same default contents, + as initscripts is now using /etc/motd again as a real file. + + -- Santiago Vila <sanvila@debian.org> Sun, 17 Jun 2012 14:14:44 +0200 + +base-files (6.10) unstable; urgency=low + + * Record md5sums of unmodified /etc/profile versions so that we can + upgrade it automatically, as it's done in Ubuntu. + * In the initial install, create /etc/motd.tail instead of /etc/motd, + as /etc/motd is converted to a symlink by initscripts and /etc/motd.tail + is since a long time the master copy to which the output of uname is added. + Remove postinst code which tries to update /etc/motd, as it does no longer + work and the file has not changed in a lot of time. Will add code to + update /etc/motd.tail based on md5sum if it ever changes in a future. + * Implement proposed transition plan for group staff in /usr/local. + The file /etc/staff-group-for-usr-local is now created on upgrades + from releases before 6.10 and (for now) also on initial install. + * Removed reference to /etc/nsswitch.conf in extended description, as + the file is being moved to libc-bin. + + -- Santiago Vila <sanvila@debian.org> Sat, 09 Jun 2012 17:41:30 +0200 + +base-files (6.9) unstable; urgency=low + + * We can't make /etc/profile a conffile without triggering a piuparts + check which is considered to be serious. Sorry, /etc/profile + will be handled as before for now. Closes: #673767. + + -- Santiago Vila <sanvila@debian.org> Mon, 21 May 2012 15:12:06 +0200 + +base-files (6.8) unstable; urgency=low + + * Added /etc/os-release. Closes: #659853. Note: for stable releases + this file will look like it's suggested in the bug report above. + Also, like /etc/debian_version, this file should only be considered + meaningful for stable releases, which testing and unstable are not. + * By popular demand, make /etc/profile a conffile. Closes: #668871. + * Added /sys for all systems but the Hurd. Closes: #670091. + * Added /proc for the Hurd, as it's already being used. + * Added a lintian override for /root being 700. + + -- Santiago Vila <sanvila@debian.org> Thu, 17 May 2012 00:08:42 +0200 + +base-files (6.7) unstable; urgency=low + + * Switch to "compat" again in default /etc/nsswitch.conf. It is not + obsolete and it should not go away. Closes: #651356. + Thanks a lot to Petter Reinholdtsen. + + -- Santiago Vila <sanvila@debian.org> Sun, 04 Mar 2012 01:02:00 +0100 + +base-files (6.6) unstable; urgency=low + + * Switch to "files" instead of "compat" in default /etc/nsswitch.conf. + That was only useful for libc5. The new default will only take + effect for new installs. Thanks to Roger Leigh. Closes: #651356. + * Reword the very first question in base-files FAQ. Closes: #622200. + * When migrating /var/run and /var/lock, create relative symlinks + instead of absolute ones. Useful for chroots. Closes: #652301. + + -- Santiago Vila <sanvila@debian.org> Sat, 03 Mar 2012 16:35:22 +0100 base-files (6.5ubuntu11) quantal; urgency=low @@ -2101,3 +2207,4 @@ base-files (1.2.0-1) unstable; urgency=low /etc/passwd and /etc/group are installed by the "base-passwd" package. -- Bruce Perens <bruce@pixar.com> Thu, 14 Nov 1996 21:02:09 -0800 + diff --git a/debian/check-etc-profile-md5sum b/debian/check-etc-profile-md5sum new file mode 100644 index 0000000..91ac543 --- /dev/null +++ b/debian/check-etc-profile-md5sum @@ -0,0 +1,7 @@ +#!/bin/sh +md5=`md5sum share/profile | cut -f 1 -d " "` +if ! grep -q "$md5" share/profile.md5sums; then + echo Error: share/profile.md5sums is incomplete. + echo Need to add "$md5" with current version. + exit 1 +fi diff --git a/debian/control b/debian/control index a47c0d2..531b16c 100644 --- a/debian/control +++ b/debian/control @@ -11,13 +11,13 @@ Architecture: any Pre-Depends: awk Essential: yes Priority: required -Replaces: base, miscutils, dpkg (<= 1.15.0), lsb-release (<< 3.0-8) -Breaks: initscripts (<< 2.88dsf-13.3) +Replaces: base, miscutils, dpkg (<= 1.15.0) +Breaks: initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~) Description: Debian base system miscellaneous files This package contains the basic filesystem hierarchy of a Debian system, and several important miscellaneous files, such as /etc/debian_version, - /etc/host.conf, /etc/issue, /etc/motd, /etc/profile, /etc/nsswitch.conf, - and others, and the text of several common licenses in use on Debian systems. + /etc/host.conf, /etc/issue, /etc/motd, /etc/profile, and others, + and the text of several common licenses in use on Debian systems. Package: lsb-release-udeb Section: debian-installer diff --git a/debian/current-md5sums b/debian/current-md5sums-obsolete index 5236dc4..5236dc4 100755 --- a/debian/current-md5sums +++ b/debian/current-md5sums-obsolete diff --git a/debian/directory-list b/debian/directory-list index 355d063..06c84ee 100644 --- a/debian/directory-list +++ b/debian/directory-list @@ -13,6 +13,7 @@ proc root run sbin +sys tmp usr usr/bin @@ -24,6 +25,7 @@ usr/share usr/share/common-licenses usr/share/dict usr/share/info +usr/share/lintian/overrides usr/share/man usr/share/misc usr/src diff --git a/debian/lintian b/debian/lintian new file mode 100644 index 0000000..1b7cc5a --- /dev/null +++ b/debian/lintian @@ -0,0 +1,5 @@ +# +# Permissions 0700 on /root are intentional as people expect +# the /root directory to be more private than /home/* directories. +# +base-files: non-standard-dir-perm root/ 0700 != 0755 diff --git a/debian/postinst.in b/debian/postinst.in index 3db158a..bdd916e 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -5,8 +5,6 @@ install_local_dir() { if [ ! -d $1 ]; then mkdir -p $1 fi - #chown root:staff $1 2> /dev/null || true - #chmod 2775 $1 2> /dev/null || true } install_from_default() { @@ -131,9 +129,12 @@ if [ "$1" = "configure" ] && [ "$2" != "" ]; then fi if [ -f /etc/profile ]; then - md5=`md5sum /etc/profile | cut -f 1 -d\ ` - if grep -qw "$md5" /usr/share/base-files/profile.md5sums; then - cp /usr/share/base-files/profile /etc/profile + md5=`md5sum /etc/profile | cut -f 1 -d " "` + if grep -q "$md5" /usr/share/base-files/profile.md5sums; then + if ! cmp -s /usr/share/base-files/profile /etc/profile; then + cp -p /usr/share/base-files/profile /etc/profile + echo Updating unmodified /etc/profile to current default. + fi fi fi fi @@ -148,3 +149,4 @@ if dpkg --compare-versions "$2" le-nl "5.0.0ubuntu22" && rm /etc/apt/apt.conf.d/00secure fi fi + diff --git a/debian/rules b/debian/rules index 94d114b..96aefdc 100755 --- a/debian/rules +++ b/debian/rules @@ -25,10 +25,6 @@ clean: rm -f `find . -name "*~"` rm -rf debian/tmp debian/lsb-release-udeb debian/files* core debian/substvars - # update md5sums list for profile - LIST="`md5sum share/profile | cut -f 1 -d\ | cat share/profile.md5sums - | sort -u`"; \ - echo "$$LIST" > share/profile.md5sums - binary-arch: build rm -rf debian/tmp install -d debian/tmp/DEBIAN $(docdir) debian/tmp/etc/dpkg/origins @@ -39,6 +35,7 @@ binary-arch: build cat debian/copyright.in | sed -e "s&#OSNAME#&$(OSNAME)&g" \ > $(docdir)/copyright chmod 644 $(docdir)/copyright + sh debian/check-etc-profile-md5sum sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in \ > debian/tmp/DEBIAN/postinst chmod 755 debian/tmp/DEBIAN/postinst @@ -47,15 +44,16 @@ binary-arch: build cd debian/tmp && install -d `cat ../directory-list` install -p -m 644 share/* debian/tmp/usr/share/base-files install -p -m 644 licenses/* debian/tmp/usr/share/common-licenses + install -p -m 644 debian/lintian \ + debian/tmp/usr/share/lintian/overrides/$(package) ln -s GFDL-1.3 debian/tmp/usr/share/common-licenses/GFDL ln -s LGPL-3 debian/tmp/usr/share/common-licenses/LGPL ln -s GPL-3 debian/tmp/usr/share/common-licenses/GPL ln -s README $(docdir)/FAQ install -p -m 644 etc/* debian/tmp/etc install -p -m 755 debian/update-motd.d/* debian/tmp/etc/update-motd.d - rm -f debian/tmp/etc/motd ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) - rmdir debian/tmp/proc + rmdir debian/tmp/sys endif sed -e "s&#OSNAME#&$(OSNAME)&g" share/info.dir \ > debian/tmp/usr/share/base-files/info.dir @@ -65,7 +63,6 @@ endif > debian/tmp/etc/issue.net sed -e "s&#OSNAME#&$(OSNAME)&g" etc/os-release \ > debian/tmp/etc/os-release - gzip -9 $(docdir)/changelog cd debian/tmp && \ md5sum `find usr -type f` > DEBIAN/md5sums @@ -75,8 +72,7 @@ endif cd debian/tmp && chmod 1777 `cat ../1777-dirs` cd debian/tmp && chmod 2775 `cat ../2775-dirs` cd debian/tmp && chmod 700 root - cd debian/tmp && chmod 700 `cat ../700-dirs` - dpkg-gencontrol -pbase-files -isp + dpkg-gencontrol -pbase-files dpkg --build debian/tmp .. binary-indep: build |