diff -u netkit-rsh-0.17/debian/changelog netkit-rsh-0.17/debian/changelog --- netkit-rsh-0.17/debian/changelog +++ netkit-rsh-0.17/debian/changelog @@ -1,10 +1,13 @@ -netkit-rsh (0.17-14ubuntu1) hardy; urgency=low +netkit-rsh (0.17-15) unstable; urgency=low - * Merge from Debian unstable. Remaining Ubuntu changes: - - debian/rules adding execution rights on debian/checkrhosts - * Update maintainer in field debian/control. + * Fixed /etc/pam.d/ files. (Closes: #546394, #489589) + Also make them use common-* + * Clean debian/rules. + * Moved to debhelper compat 7 + * Bumped Standards-Version to 3.8.4. + * Improved package description (Closes: #493476, #493474) - -- Lionel Porcheron Thu, 22 Nov 2007 10:05:39 +0100 + -- Alberto Gonzalez Iniesta Sat, 19 Jun 2010 20:54:08 +0200 netkit-rsh (0.17-14) unstable; urgency=low @@ -13,22 +16,12 @@ * Removed '-s' from install calls in the Makefiles. (Closes: #437614) * Bumped Standards-Version to 3.7.2.2. No change - * Moved to debhelper compatability 4. Created debian/compat. + * Moved to debhelper compatibility 4. Created debian/compat. Fixed debian/rules * rsh-server: Added dependency on inet-superserver -- Alberto Gonzalez Iniesta Thu, 16 Aug 2007 10:55:38 +0200 -netkit-rsh (0.17-13ubuntu1) feisty; urgency=low - - * debian/control: Add update-inetd to rsh-server's dependencies - (Closes Ubuntu: #76143). - * debian/control: Add openbsd-inetd | inet-superserver dependencies - as rsh-server needs an inet server to work - * debian/rules adding execution rights on debian/checkrhosts (Closes Ubuntu: #45991) - - -- Lionel Porcheron Sun, 17 Dec 2006 14:37:24 +0100 - netkit-rsh (0.17-13) unstable; urgency=low * Patched rlogin.c so that calling it as 'netkit-rlogin' will also diff -u netkit-rsh-0.17/debian/rules netkit-rsh-0.17/debian/rules --- netkit-rsh-0.17/debian/rules +++ netkit-rsh-0.17/debian/rules @@ -21,14 +21,14 @@ dh_testdir dh_testroot - -$(MAKE) distclean + [ ! -f MCONFIG ] || $(MAKE) distclean dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) -C rcp INSTALLROOT=`pwd`/debian/rsh-client/ MANDIR=/usr/share/man install @@ -54,7 +54,6 @@ cp debian/*.5 debian/rsh-server/usr/share/man/man5 cp debian/*.8 debian/rsh-server/usr/share/man/man8 cp debian/checkrhosts debian/rsh-server/usr/sbin - chmod 755 debian/rsh-server/usr/sbin/checkrhosts cp debian/hosts.equiv debian/rsh-server/etc # Build architecture-independent files here. diff -u netkit-rsh-0.17/debian/control netkit-rsh-0.17/debian/control --- netkit-rsh-0.17/debian/control +++ netkit-rsh-0.17/debian/control @@ -2,22 +2,21 @@ Section: net Priority: extra -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Alberto Gonzalez Iniesta -Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 4.0.2), libpam-dev +Maintainer: Alberto Gonzalez Iniesta +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7), libpam-dev Package: rsh-client Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: suidmanager (<< 0.50) Replaces: netstd -Description: rsh clients +Description: client programs for remote shell connections This package contains rsh, rcp and rlogin. Package: rsh-server Architecture: any -Depends: openbsd-inetd | inet-superserver, ${shlibs:Depends} +Depends: openbsd-inetd | inet-superserver, ${shlibs:Depends}, ${misc:Depends} Replaces: netstd -Description: rsh servers +Description: server program for remote shell connections This package contains rexecd, rlogind and rshd. diff -u netkit-rsh-0.17/debian/pam.d/rexec netkit-rsh-0.17/debian/pam.d/rexec --- netkit-rsh-0.17/debian/pam.d/rexec +++ netkit-rsh-0.17/debian/pam.d/rexec @@ -4,2 +4,2 @@ -auth required pam_unix_auth.so shadow nullok -account required pam_unix_acct.so +@include common-auth +@include common-account diff -u netkit-rsh-0.17/debian/pam.d/rsh netkit-rsh-0.17/debian/pam.d/rsh --- netkit-rsh-0.17/debian/pam.d/rsh +++ netkit-rsh-0.17/debian/pam.d/rsh @@ -8,5 +8,4 @@ -auth required pam_nologin.so auth required pam_env.so -auth required pam_rhosts_auth.so -account required pam_unix_acct.so -session required pam_unix_session.so +auth required pam_rhosts.so +@include common-account +@include common-session diff -u netkit-rsh-0.17/debian/pam.d/rlogin netkit-rsh-0.17/debian/pam.d/rlogin --- netkit-rsh-0.17/debian/pam.d/rlogin +++ netkit-rsh-0.17/debian/pam.d/rlogin @@ -4,6 +4,5 @@ -auth sufficient pam_rhosts_auth.so -auth required pam_unix.so nullok -account required pam_unix.so -password required pam_unix.so nullok use_authtok obscure \ - min=4 max=8 -session required pam_unix.so +auth sufficient pam_rhosts.so +@include common-auth +@include common-account +@include common-session +@include common-password diff -u netkit-rsh-0.17/debian/compat netkit-rsh-0.17/debian/compat --- netkit-rsh-0.17/debian/compat +++ netkit-rsh-0.17/debian/compat @@ -1 +1 @@ -4 +7