[23260] in Source-Commits
/svn/athena r22921 - in trunk/debathena/config/linerva: debian files files/etc files/etc/apt files/etc/apt/sources.list.d files/etc/openafs files/etc/ssh files/sbin files/usr files/usr/local files/usr/local/sbin
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Mon Apr 21 19:26:08 2008
Date: Mon, 21 Apr 2008 19:25:37 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804212325.TAA17158@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-21 19:25:35 -0400 (Mon, 21 Apr 2008)
New Revision: 22921
Added:
trunk/debathena/config/linerva/files/etc/apt/
trunk/debathena/config/linerva/files/etc/apt/preferences
trunk/debathena/config/linerva/files/etc/apt/sources.list.d/
trunk/debathena/config/linerva/files/etc/apt/sources.list.d/backports.list
trunk/debathena/config/linerva/files/etc/openafs/
trunk/debathena/config/linerva/files/etc/openafs/cacheinfo.debathena.debathena
trunk/debathena/config/linerva/files/etc/ssh/
trunk/debathena/config/linerva/files/etc/ssh/sshd_config.debathena.debathena
trunk/debathena/config/linerva/files/sbin/
trunk/debathena/config/linerva/files/sbin/init.debathena
trunk/debathena/config/linerva/files/usr/local/
trunk/debathena/config/linerva/files/usr/local/sbin/
trunk/debathena/config/linerva/files/usr/local/sbin/linerva-install
Modified:
trunk/debathena/config/linerva/debian/changelog
trunk/debathena/config/linerva/debian/control
trunk/debathena/config/linerva/debian/control.in
trunk/debathena/config/linerva/debian/debathena-linerva.postinst
trunk/debathena/config/linerva/debian/rules
Log:
In linerva:
* Add /etc/ssh/sshd_config (for port 8080 sshd)
* Add /etc/apt/preferences and /etc/apt/sources.list.d/backports.
* Convert to use config-package.mk interface, new in config-package-
dev 4.5
* Replace DEB_REPLACE_FILES with DEB_TRANSFORM_FILES, as this was
renamed in config-package-dev 4.5
* Add init.debathena, which causes /sbin/init to be executed in the 32-bit
personality
* There's no longer a sshd_config file - get rid of that
* Add linerva-install
Modified: trunk/debathena/config/linerva/debian/changelog
===================================================================
--- trunk/debathena/config/linerva/debian/changelog 2008-04-21 21:52:41 UTC (rev 22920)
+++ trunk/debathena/config/linerva/debian/changelog 2008-04-21 23:25:35 UTC (rev 22921)
@@ -1,3 +1,28 @@
+debathena-linerva (1.9) unstable; urgency=low
+
+ * Add /etc/ssh/sshd_config (for port 8080 sshd)
+ * Add /etc/apt/preferences and /etc/apt/sources.list.d/backports.
+ * Convert to use config-package.mk interface, new in config-package-
+ dev 4.5
+ * Replace DEB_REPLACE_FILES with DEB_TRANSFORM_FILES, as this was
+ renamed in config-package-dev 4.5
+
+ -- Tim Abbott <tabbott@mit.edu> Mon, 21 Apr 2008 19:23:36 -0400
+
+debathena-linerva (1.8) unstable; urgency=low
+
+ * Add init.debathena, which causes /sbin/init to be executed in the 32-bit
+ personality
+ * There's no longer a sshd_config file - get rid of that
+
+ -- Evan Broder <broder@mit.edu> Sun, 20 Apr 2008 17:53:16 -0400
+
+debathena-linerva (1.7) unstable; urgency=low
+
+ * Add linerva-install
+
+ -- Nelson Elhage <nelhage@mit.edu> Sun, 20 Apr 2008 17:01:30 -0400
+
debathena-linerva (1.6) unstable; urgency=low
* Clean up the postinst script somewhat.
Modified: trunk/debathena/config/linerva/debian/control
===================================================================
--- trunk/debathena/config/linerva/debian/control 2008-04-21 21:52:41 UTC (rev 22920)
+++ trunk/debathena/config/linerva/debian/control 2008-04-21 23:25:35 UTC (rev 22921)
@@ -2,12 +2,12 @@
Section: linerva/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, sysklogd
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.4), sysklogd
Standards-Version: 3.7.2
Package: debathena-linerva
Architecture: all
-Depends: logcheck, screen, elinks, sysklogd
+Depends: logcheck, screen, elinks, sysklogd, linux32
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Special Configuration for Linerva
Modified: trunk/debathena/config/linerva/debian/control.in
===================================================================
--- trunk/debathena/config/linerva/debian/control.in 2008-04-21 21:52:41 UTC (rev 22920)
+++ trunk/debathena/config/linerva/debian/control.in 2008-04-21 23:25:35 UTC (rev 22921)
@@ -7,7 +7,7 @@
Package: debathena-linerva
Architecture: all
-Depends: logcheck, screen, elinks, sysklogd
+Depends: logcheck, screen, elinks, sysklogd, linux32
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Special Configuration for Linerva
Modified: trunk/debathena/config/linerva/debian/debathena-linerva.postinst
===================================================================
--- trunk/debathena/config/linerva/debian/debathena-linerva.postinst 2008-04-21 21:52:41 UTC (rev 22920)
+++ trunk/debathena/config/linerva/debian/debathena-linerva.postinst 2008-04-21 23:25:35 UTC (rev 22921)
@@ -84,6 +84,7 @@
lose_setuid /usr/bin/sudo
lose_setuid /usr/lib/pt_chown
lose_setuid /usr/lib/emacs/21.4/i386-linux/movemail
+ lose_setuid /usr/lib/openssh/ssh-keysign
lose_setuid /usr/lib/ssh-keysign
lose_setuid /usr/sbin/pppd
lose_setuid /usr/sbin/pppoe
Modified: trunk/debathena/config/linerva/debian/rules
===================================================================
--- trunk/debathena/config/linerva/debian/rules 2008-04-21 21:52:41 UTC (rev 22920)
+++ trunk/debathena/config/linerva/debian/rules 2008-04-21 23:25:35 UTC (rev 22921)
@@ -23,12 +23,12 @@
/usr/bin/elinks.debathena \
/etc/motd.debathena \
/etc/resolv.conf.debathena \
- /usr/bin/id.debathena \
/etc/security/limits.conf.debathena \
- /etc/ssh/sshd_config \
- /etc/openafs/cacheinfo.debathena.debathena
-DEB_REPLACE_FILES_debathena-linerva += \
+ /etc/openafs/cacheinfo.debathena.debathena \
+ /sbin/init.debathena \
+ /etc/ssh/sshd_config.debathena.debathena
+DEB_TRANSFORM_FILES_debathena-linerva += \
/etc/syslog.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/replace-files.mk
+include /usr/share/cdbs/1/rules/config-package.mk
Added: trunk/debathena/config/linerva/files/etc/apt/preferences
Added: trunk/debathena/config/linerva/files/etc/apt/sources.list.d/backports.list
Added: trunk/debathena/config/linerva/files/etc/openafs/cacheinfo.debathena.debathena
Added: trunk/debathena/config/linerva/files/etc/ssh/sshd_config.debathena.debathena
Added: trunk/debathena/config/linerva/files/sbin/init.debathena
Property changes on: trunk/debathena/config/linerva/files/sbin/init.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/linerva/files/usr/local/sbin/linerva-install
