Upgrade crossavr-*, openssh.spec i msmtp.spec
Tomasz Jadowski
jadowski w post.pl
Nie, 14 Lis 2004, 12:58:40 CET
Witam,
To są moje pierwsze diffy, więc nie bijcie za mocno :)
Wszystkie poza openssh polegały na podbiciu wersji
na [NEW] z PLD-update-TODO.
W openssh dodałem tryb inetd i standalone wzorując się na
stunnel.spec. Acha Ktoś(TM) mógłby przy okazji poprawić
stunnel. Jest: %description standalone -l pl a powinno być
%description inetd -l pl
Testowane i działa :)
Pozdrawiam
Tomek
--
[ Tomasz 'tomcio44' Jadowski jadowski w post.pl PGP ID: 0x13AB0663
[ Fingerprint: 3252 FE7F 703C 7A13 A2A0 021A A7B2 74A5 13AB 0663
[ JID: tomcio44 w chrome.pl | GG: 1247741 | http://tomcio44.jogger.pl
-------------- następna część ---------
--- SPECS/crossavr-binutils.spec 2004-11-14 12:44:10.000000000 +0100
+++ TSL/crossavr-binutils.spec 2004-11-14 12:38:53.000000000 +0100
@@ -6,8 +6,8 @@
Summary(pt_BR): Utilitários para desenvolvimento de binários da GNU - AVR binutils
Summary(tr): GNU geliţtirme araçlarý - AVR binutils
Name: crossavr-binutils
-Version: 2.15.91.0.1
-Release: 1
+Version: 2.15.91.0.2
+Release: 0.1
License: GPL
Group: Development/Tools
Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-------------- następna część ---------
--- SPECS/crossavr-gcc.spec 2004-11-14 12:44:11.000000000 +0100
+++ TSL/crossavr-gcc.spec 2004-11-14 12:38:07.000000000 +0100
@@ -6,9 +6,9 @@
Summary(pt_BR): Utilitários para desenvolvimento de binários da GNU - AVR gcc
Summary(tr): GNU geliţtirme araçlarý - AVR gcc
Name: crossavr-gcc
-Version: 3.4.1
-Release: 2
-Epoch: 1
+Version: 3.4.2
+Release: 0.1
+Epoch: 2
License: GPL
Group: Development/Languages
Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
-------------- następna część ---------
--- SPECS/crossavr-gdb.spec 2004-11-14 12:44:11.000000000 +0100
+++ TSL/crossavr-gdb.spec 2004-11-14 12:37:08.000000000 +0100
@@ -11,7 +11,7 @@
Summary(zh_CN): [żŞˇ˘]CşÍĆäËűÓďŃԾľ÷ĘÔĆ÷
Summary(zh_TW): [.-Aś}ľo]CŠM.$)B¨ä.-AĽLťy.$)B¨ĽŞş˝Ő¸Őžš
Name: crossavr-gdb
-Version: 6.2
+Version: 6.2.1
Release: 0.1
License: GPL
Group: Development/Debuggers
-------------- następna część ---------
--- SPECS/msmtp.spec 2004-11-14 12:44:13.000000000 +0100
+++ TSL/msmtp.spec 2004-11-14 12:39:41.000000000 +0100
@@ -2,8 +2,8 @@
Summary: SMTP "plugin" for MUAs
Summary(pl): "Wtyczka" SMTP dla klientów pocztowych (MUA)
Name: msmtp
-Version: 1.2.3
-Release: 1
+Version: 1.2.4
+Release: 0.1
License: GPL
Group: Networking/Daemons
Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-------------- następna część ---------
--- SPECS/openssh.spec 2004-11-14 12:21:40.000000000 +0100
+++ TSL/openssh.spec 2004-11-14 10:23:42.000000000 +0100
@@ -22,7 +22,7 @@
Summary(uk): OpenSSH - ׌ĚŘÎÁ ŇĹÁĚŚÚÁĂŚŃ ĐŇĎÔĎËĎĚŐ Secure Shell (SSH)
Name: openssh
Version: 3.9p1
-Release: 2
+Release: 3
Epoch: 2
License: BSD
Group: Applications/Networking
@@ -42,6 +42,7 @@
# NoSource10-md5: f14cb61fafd067a3f5ce4eaa9643bf05
Source11: ssh-agent.sh
Source12: ssh-agent.conf
+Source13: %{name}d.inet
Patch0: %{name}-no_libnsl.patch
Patch2: %{name}-linux-ipv6.patch
Patch3: %{name}-pam_misc.patch
@@ -341,6 +342,32 @@
ŢÁÓÔÉÎÁ ĐŇĎÔĎËĎĚŐ Secure Shell, ŃËÁ ÄĎÚ×ĎĚѤ ËĚŚ¤ÎÔÁÍ ssh Ú×'ŃÚŐ×ÁÔÉÓŘ
Ú ×ÁŰÉÍ ČĎÓÔĎÍ.
+%package server-standalone
+Summary: OpenSSH Secure Shell protocol acts as standalone server
+Summary(pl): Secure Shell (sshd) działający jako samodzielny serwer
+Group: Networking/Daemons
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-inetd
+
+%description server-standalone
+Ssh (Secure Shell) acts as standalone server.
+
+%description server-standalone -l pl
+Ssh (Secure Shell) działający jako samodzielny serwer.
+
+%package server-inetd
+Summary: OpenSSH Secure Shell protocol acts as inetd service
+Summary(pl): Secure Shell (sshd) działający jako usługa inetd
+Group: Networking/Daemons
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-standalone
+
+%description server-inetd
+Ssh (Secure Shell) acts as inetd service.
+
+%description server-inetd -l pl
+Ssh (Secure Shell) działający jako usługa inetd.
+
%package gnome-askpass
Summary: OpenSSH GNOME passphrase dialog
Summary(de): OpenSSH GNOME Passwort-Dialog
@@ -456,7 +483,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig/rc-inetd,security,env.d}} \
$RPM_BUILD_ROOT%{_libexecdir}/ssh
%{?with_sshagentsh:install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}}
@@ -470,6 +497,7 @@
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config
+install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/sshd
%if %{with sshagentsh}
install %{SOURCE11} $RPM_BUILD_ROOT/etc/profile.d/
ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh
@@ -517,18 +545,25 @@
fi
%post server
+if ! grep -qs ssh /etc/security/passwd.conf ; then
+ umask 022
+ echo "ssh" >> /etc/security/passwd.conf
+fi
+
+%postun server
+if [ "$1" = "0" ]; then
+ %userremove sshd
+fi
+
+%post server-standalone
/sbin/chkconfig --add sshd
if [ -f /var/lock/subsys/sshd ]; then
/etc/rc.d/init.d/sshd restart 1>&2
else
echo "Run \"/etc/rc.d/init.d/sshd start\" to start openssh daemon."
fi
-if ! grep -qs ssh /etc/security/passwd.conf ; then
- umask 022
- echo "ssh" >> /etc/security/passwd.conf
-fi
-%preun server
+%preun server-standalone
if [ "$1" = "0" ]; then
if [ -f /var/lock/subsys/sshd ]; then
/etc/rc.d/init.d/sshd stop 1>&2
@@ -536,11 +571,19 @@
/sbin/chkconfig --del sshd
fi
-%postun server
-if [ "$1" = "0" ]; then
- %userremove sshd
+%post server-inetd
+if [ -f /var/lock/subsys/rc-inetd ]; then
+ /etc/rc.d/init.d/rc-inetd restart 1>&2
+else
+ echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
+fi
+
+%postun server-inetd
+if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
+ /etc/rc.d/init.d/rc-inetd reload 1>&2
fi
+
%files
%defattr(644,root,root,755)
%doc *.RNG TODO README OVERVIEW CREDITS Change*
@@ -594,9 +637,16 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sshd_config
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/sshd
%attr(640,root,root) %{_sysconfdir}/moduli
+%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.sshd
+
+%files server-standalone
+%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/sshd
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/sshd
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.sshd
+
+%files server-inetd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/sshd
%if %{with gnome} || %{with gtk}
%files gnome-askpass
-------------- następna część ---------
SERVICE_NAME=ssh
SOCK_TYPE=stream
PROTOCOL=tcp
PORT=22
FLAGS=nowait
USER=root
SERVER=tcpd
DAEMON=/usr/sbin/sshd
DAEMONARGS="-i -f /etc/ssh/sshd_config"
Więcej informacji o liście dyskusyjnej pld-devel-pl