[26966] in Source-Commits
/svn/athena r25859 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Mar 21 13:25:07 2013
Date: Thu, 21 Mar 2013 13:25:01 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303211725.r2LHP0H7016479@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-21 13:25:00 -0400 (Thu, 21 Mar 2013)
New Revision: 25859
Added:
trunk/debathena/config/auto-update/debian/control
Removed:
trunk/debathena/config/auto-update/debian/control.in
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-update
trunk/debathena/config/auto-update/debian/changelog
trunk/debathena/config/auto-update/debian/compat
trunk/debathena/config/auto-update/debian/copyright
trunk/debathena/config/auto-update/debian/debathena-auto-update.init
trunk/debathena/config/auto-update/debian/rules
Log:
In auto-update:
* Actually, don't bother cleaning up the headers by hand. Instead, just
auto-remove packages (unless that would remove metapackages) for
compatibility with old aptitude-based updater. (Trac: #1012)
* Convert from CDBS to dh7 and build-dep on dh 7.0.50
* Update copyright file to format 1.0 and re-license under BSD 3-clause
* Bump Standards-Version to 3.9.3
* Remove unneeded dependency on bsdutils (it's required)
* Add $remote_fs dependency in init script because it's apparently still
1992 and /usr might be an NFS mount
Modified: trunk/debathena/config/auto-update/debian/athena-auto-update
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-update 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/athena-auto-update 2013-03-21 17:25:00 UTC (rev 25859)
@@ -342,7 +342,6 @@
for k in $toremove; do
if [ "$(uname -r)" != "$k" ]; then
kpkgs="$kpkgs linux-image-$k"
- khpkgs="$khpkgs linux-headers-$k"
fi
done
echo "Will remove these kernels: $kpkgs"
@@ -355,19 +354,23 @@
else
warn "Simulation failed!"
fi
- echo "Removing corresponding headers: $khpkgs"
- echo "Simulating..."
- if v apt-get -y -s remove $khpkgs; then
- echo "Simulation ok, proceeding..."
- if ! v apt-get -y remove $khpkgs; then
- warn "Something went wrong trying to remove kernels!"
- fi
- else
- warn "Simulation failed!"
- fi
fi
fi
+# Auto-remove packages
+echo "Attempting to auto-remove old packages"
+echo "Simulating..."
+AUTOREMOVE="$(apt-get --assume-yes --simulate autoremove)"
+if [ $? -ne 0 ]; then
+ warn "Auto-remove simulation failed!"
+elif echo "$AUTOREMOVE" | egrep -q '^Remv debathena-(cluster|workstation|login-graphical|login|standard|auto-update) '; then
+ warn "Metapackages would be removed by auto-remove!"
+else
+ if ! v apt-get -y autoremove; then
+ complain "Auto-remove failed even though simulation succeeded (shouldn't happen)"
+ fi
+fi
+
# Finally, update the apt-file cache
v apt-file update
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/changelog 2013-03-21 17:25:00 UTC (rev 25859)
@@ -1,3 +1,17 @@
+debathena-auto-update (1.42.2) unstable; urgency=low
+
+ * Actually, don't bother cleaning up the headers by hand. Instead, just
+ auto-remove packages (unless that would remove metapackages) for
+ compatibility with old aptitude-based updater. (Trac: #1012)
+ * Convert from CDBS to dh7 and build-dep on dh 7.0.50
+ * Update copyright file to format 1.0 and re-license under BSD 3-clause
+ * Bump Standards-Version to 3.9.3
+ * Remove unneeded dependency on bsdutils (it's required)
+ * Add $remote_fs dependency in init script because it's apparently still
+ 1992 and /usr might be an NFS mount
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 21 Mar 2013 13:20:48 -0400
+
debathena-auto-update (1.42.1) unstable; urgency=low
* Also cleanup the headers for any kernels we remove. (Trac: #1012)
Modified: trunk/debathena/config/auto-update/debian/compat
===================================================================
--- trunk/debathena/config/auto-update/debian/compat 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/compat 2013-03-21 17:25:00 UTC (rev 25859)
@@ -1 +1 @@
-6
+7
Copied: trunk/debathena/config/auto-update/debian/control (from rev 25803, trunk/debathena/config/auto-update/debian/control.in)
===================================================================
--- trunk/debathena/config/auto-update/debian/control (rev 0)
+++ trunk/debathena/config/auto-update/debian/control 2013-03-21 17:25:00 UTC (rev 25859)
@@ -0,0 +1,15 @@
+Source: debathena-auto-update
+Section: debathena/net
+Priority: extra
+Maintainer: Debathena Project <debathena@mit.edu>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
+
+Package: debathena-auto-update
+Architecture: all
+# For dpkg-maintscript-helper
+Pre-Depends: dpkg (>= 1.15.7.2~)
+Depends: ${misc:Depends}, debathena-desync, cron, aptitude, apt-file, kexec-tools, bc, debathena-license-config, debathena-athinfod (>= 10.1-0debathena1~)
+Breaks: debathena-reactivate (<< 2.0~)
+Description: Performs automatic updates for Athena machines.
+ This package performs automatic updates for Athena machines.
Modified: trunk/debathena/config/auto-update/debian/copyright
===================================================================
--- trunk/debathena/config/auto-update/debian/copyright 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/copyright 2013-03-21 17:25:00 UTC (rev 25859)
@@ -1,18 +1,31 @@
-The Athena source code was obtained from the Athena SVN repository at
-<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Copyright © 2008 by the Massachusetts Institute of Technology.
-
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and
- that both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of M.I.T. not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission. M.I.T. makes no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
-
-The Debian packaging is Copyright © 2008 Massachusetts Institute of
-Technology, and has the same license as the original software.
+Files: *
+Copyright: (c) 2008-2013 Massachusetts Institute of Technology
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the Massachusetts Institute of Technology
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MASSACHUSETTS
+ INSTITUTE OF TECHNOLOGY BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
Modified: trunk/debathena/config/auto-update/debian/debathena-auto-update.init
===================================================================
--- trunk/debathena/config/auto-update/debian/debathena-auto-update.init 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/debathena-auto-update.init 2013-03-21 17:25:00 UTC (rev 25859)
@@ -2,8 +2,8 @@
#
### BEGIN INIT INFO
# Provides: debathena-auto-update
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Run an update at boot time
Modified: trunk/debathena/config/auto-update/debian/rules
===================================================================
--- trunk/debathena/config/auto-update/debian/rules 2013-03-21 16:36:10 UTC (rev 25858)
+++ trunk/debathena/config/auto-update/debian/rules 2013-03-21 17:25:00 UTC (rev 25859)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-DEB_DH_INSTALLINIT_ARGS_debathena-auto-update="--no-start"
-DEB_UPDATE_RCD_PARAMS_debathena-auto-update="defaults 98 02"
+%:
+ dh $@
-include /usr/share/cdbs/1/rules/debhelper.mk
+override_dh_installinit:
+ dh_installinit --no-start --update-rcd-params="defaults 98 02"
