SPECS: openssh.spec - adapterized

glen glen at pld-linux.org
Mon Feb 13 13:00:22 CET 2006 

Author: glen                         Date: Mon Feb 13 12:00:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized

---- Files affected:
SPECS:
   openssh.spec (1.247 -> 1.248) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.247 SPECS/openssh.spec:1.248
--- SPECS/openssh.spec:1.247	Thu Feb  9 15:13:17 2006
+++ SPECS/openssh.spec	Mon Feb 13 13:00:17 2006
@@ -41,7 +41,7 @@
 Source4:	%{name}d.pamd
 Source5:	%{name}.sysconfig
 Source6:	passwd.pamd
-Source7:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/openssh-non-english-man-pages.tar.bz2
+Source7:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source7-md5:	66943d481cc422512b537bcc2c7400d1
 Source9:	http://www.taiyo.co.jp/~gotoh/ssh/connect.c
 # NoSource9-md5:	e1c3cbed88f08ea778d90813d48cd428
@@ -61,7 +61,7 @@
 Patch8:		%{name}-chroot.patch
 Patch9:		%{name}-selinux.patch
 Patch10:	%{name}-selinux-pld.patch
-# High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/ 
+# High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11.diff
 Patch11:	%{name}-4.2p1-hpn11.patch
 # Adds HPN (see p11) and an undocumented -z none cipher flag
@@ -69,6 +69,7 @@
 Patch12:	%{name}-4.2p1-hpn11-none.patch
 Patch13:	%{name}-include.patch
 URL:		http://www.openssh.com/
+BuildRequires:	%{__perl}
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_gnome:BuildRequires:	gnome-libs-devel}
@@ -80,7 +81,6 @@
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
-BuildRequires:	%{__perl}
 %{?with_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	zlib-devel
@@ -108,20 +108,20 @@
 client and server. To make this package useful, you should also
 install openssh-clients, openssh-server, or both.
 %if %{with hpn} || %{with hpn_none}
-This release includes High Performance SSH/SCP patches from 
-http://www.psc.edu/networking/projects/hpn-ssh/ which are supposed 
+This release includes High Performance SSH/SCP patches from
+http://www.psc.edu/networking/projects/hpn-ssh/ which are supposed
 to increase throughput on fast connections with high RTT (20-150 msec).
 See the website for '-w' values for your connection and /proc/sys TCP
 values. BTW. in a LAN you have got generally RTT < 1 msec.
 %endif
 %if %{with hpn_none}
 It also includes an undocumented '-z' option which switches
-the cipher to none after authentication is completed. Data is 
-still secured from tampering and corruption in transit through 
+the cipher to none after authentication is completed. Data is
+still secured from tampering and corruption in transit through
 the use of the Message Authentication Code (MAC).
-This option will significantly reduce the number of cpu cycles used 
-by the SSH/SCP process. This may allow some users to see significant 
-improvement in (sniffable) data tranfer rates. 
+This option will significantly reduce the number of cpu cycles used
+by the SSH/SCP process. This may allow some users to see significant
+improvement in (sniffable) data tranfer rates.
 %endif
 
 %description -l de
@@ -172,21 +172,21 @@
 klienta jak i serwera OpenSSH. Aby był użyteczny, trzeba zainstalować
 co najmniej jeden z pakietów: openssh-clients lub openssh-server.
 %if %{with hpn} || %{with hpn_none}
-Ta wersja zawiera łaty z projektu High Performance SSH/SCP 
+Ta wersja zawiera łaty z projektu High Performance SSH/SCP
 http://www.psc.edu/networking/projects/hpn-ssh/, które mają na celu
-zwiększenie przepustowości transmisji dla szybkich połączeń 
-z dużym RTT (20-150 msec). Na stronie projektu znaleźć można 
-odpowednie dla danego połączenia wartości parametru '-w' oraz 
-opcje /proc/sys dla TCP. Nawiasem mówiąc w sieciach LAN RTT < 1 msec.  
+zwiększenie przepustowości transmisji dla szybkich połączeń
+z dużym RTT (20-150 msec). Na stronie projektu znaleźć można
+odpowednie dla danego połączenia wartości parametru '-w' oraz
+opcje /proc/sys dla TCP. Nawiasem mówiąc w sieciach LAN RTT < 1 msec.
 %endif
 %if %{with hpn_none}
 Obsługiwana jest również nieudokumentowana opcja '-z' odpowiedzialna
 za wyłączenie szyfrowania danych po zakończeniu procesu uwierzytelniania.
-Dane są zabezpieczone przed modyfikacją lub uszkodzeniem przez 
+Dane są zabezpieczone przed modyfikacją lub uszkodzeniem przez
 stosowanie Message Authentication Code (MAC).
-Opcja ta znacznie redukuje liczbę cykli procesora zużywanych przez 
-procesy SSH/SCP. W wybranych zastosowaniach może ona wpłynąć 
-na wyraźne przyspieszenie (podsłuchiwalnej) transmisji danych. 
+Opcja ta znacznie redukuje liczbę cykli procesora zużywanych przez
+procesy SSH/SCP. W wybranych zastosowaniach może ona wpłynąć
+na wyraźne przyspieszenie (podsłuchiwalnej) transmisji danych.
 %endif
 
 %description -l pt
@@ -313,19 +313,19 @@
 Summary(ru):	OpenSSH - ÓĹŇ×ĹŇ ĐŇĎÔĎËĎĚÁ Secure Shell (sshd)
 Summary(uk):	OpenSSH - ÓĹŇ×ĹŇ ĐŇĎÔĎËĎĚŐ Secure Shell (sshd)
 Group:		Networking/Daemons
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	rc-scripts >= 0.4.0.18
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
 Requires(post):	chkconfig >= 0.9
 Requires(post):	grep
+Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	/bin/login
-Requires:	util-linux
 Requires:	pam >= 0.77.3
-Provides:	user(sshd)
+Requires:	rc-scripts >= 0.4.0.18
+Requires:	util-linux
 Provides:	ssh-server
+Provides:	user(sshd)
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -402,9 +402,9 @@
 Summary(uk):	OpenSSH - ÄŚÁĚĎÇ ××ĎÄŐ ËĚŔŢĎ×ϧ ĆŇÁÚÉ (passphrase) ÄĚŃ GNOME
 Group:		Applications/Networking
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	ssh-extras
-Obsoletes:	ssh-askpass
 Obsoletes:	openssh-askpass
+Obsoletes:	ssh-askpass
+Obsoletes:	ssh-extras
 
 %description gnome-askpass
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -523,9 +523,9 @@
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config
 %if %{with sshagentsh}
-install %{SOURCE11} $RPM_BUILD_ROOT/etc/profile.d/
+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
-install %{SOURCE12} $RPM_BUILD_ROOT/etc/ssh/
+install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}
 %endif
 
 bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -662,6 +662,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2006/02/13 12:00:17  glen
+- adapterized
+
 Revision 1.247  2006/02/09 14:13:17  wrobell
 - shit
 
@@ -780,7 +783,7 @@
 - "GTK+" unification (hope thats all)
 
 Revision 1.212  2004/10/12 12:35:25  ankry
-- %%groupremove/%%userremove support, some standarization
+- %groupremove/%userremove support, some standarization
 
 Revision 1.211  2004/09/12 12:09:03  blues
 - release 2; changed default config, see:
@@ -961,7 +964,7 @@
 - patch5 shouldn't be applied by default
 
 Revision 1.157  2003/06/06 12:00:12  misi3k
-rel 1 (looks stable)
+- rel 1 (looks stable)
 
 Revision 1.156  2003/05/25 11:00:56  malekith
 - massive attack, adding Source-md5
@@ -1018,7 +1021,7 @@
 - force to use openssl >= 0.9.7, idea by kloczek
 
 Revision 1.141  2003/02/09 10:43:22  qboosh
-- umask in %%post
+- umask in %post
 - build gtk2-based gnome-askpass by default
 
 Revision 1.140  2003/01/31 11:47:54  qboosh
@@ -1111,9 +1114,9 @@
 - updated to 3.2.3p1.
 
 Revision 1.116  2002/05/21 23:14:19  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.115  2002/05/20 22:29:07  kloczek
 - release 1: use new %doc packing infrastructure.
@@ -1144,7 +1147,7 @@
 
 Revision 1.108  2002/03/05 17:41:51  marcus
 - removed uclibc stuff
--rel.3.
+- rel.3.
 
 Revision 1.107  2002/02/23 04:17:25  kloczek
 - adapterized.
@@ -1161,7 +1164,7 @@
 - embed subpackage added
 
 Revision 1.103  2002/01/18 02:14:07  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.102  2001/12/02 18:08:25  kloczek
 - updated to 3.0.2p1.
@@ -1219,7 +1222,7 @@
 - disabled openssl version checking in code (rpm deps are sufficient)
 
 Revision 1.85  2001/07/13 10:00:41  kloczek
-- release 3: added "%%requires_eq openssl".
+- release 3: added "%requires_eq openssl".
 
 Revision 1.84  2001/07/12 21:08:31  kloczek
 - rebuild against openssl 0.9.6b.
@@ -1234,10 +1237,10 @@
 - release 4.
 
 Revision 1.80  2001/05/28 19:44:23  misiek
-generate RSA key, too
+- generate RSA key, too
 
 Revision 1.79  2001/05/22 09:06:33  wiget
-switch to new conditional builds macros (bcond_on_ -> _with_/bcond_off_ -> _without_); no release changes only simple s/// perfored
+- switch to new conditional builds macros (bcond_on_ -> _with_/bcond_off_ -> _without_); no release changes only simple s/// perfored
 
 Revision 1.78  2001/05/12 11:45:35  misiek
 - release 3
@@ -1247,7 +1250,7 @@
 - release 2: rebuild against openssl 0.9.6a.
 
 Revision 1.76  2001/05/02 16:29:11  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
 
 Revision 1.75  2001/05/01 22:54:39  misiek
 - updated to 2.9p1
@@ -1260,19 +1263,19 @@
 - updated to 2.5.2p2.
 
 Revision 1.72  2001/03/20 19:08:56  misiek
-2.5.2p1
+- 2.5.2p1
 
 Revision 1.71  2001/03/07 16:07:30  misiek
-change sftp-server location
+- change sftp-server location
 
 Revision 1.70  2001/03/01 07:56:36  misiek
-2.5.1p2; stb
+- 2.5.1p2; stb
 
 Revision 1.69  2001/02/28 23:07:43  misiek
-whoah! previous 2.5.1 versions were without pam support; fixed; stb
+- whoah! previous 2.5.1 versions were without pam support; fixed; stb
 
 Revision 1.68  2001/02/27 14:42:15  wiget
-fix init script (now sshd support both ssh protocol by default);release 3;stb
+- fix init script (now sshd support both ssh protocol by default);release 3;stb
 
 Revision 1.67  2001/02/24 23:47:28  kloczek
 - release 2: added a security patch (oracle) from the cvs, by Markus Friedl.
@@ -1281,7 +1284,7 @@
 - release 1.
 
 Revision 1.65  2001/02/21 16:21:51  wiget
--clients obsoletes sftp
+- clients obsoletes sftp
 
 Revision 1.64  2001/02/21 10:46:10  misiek
 2.5.1p1. stb
@@ -1309,7 +1312,7 @@
 - s/no_gnome/_without_gnome/
 
 Revision 1.57  2001/01/06 19:42:14  misiek
-release 4; fixed security bug
+- release 4; fixed security bug
 
 Revision 1.56  2000/12/11 08:28:12  qboosh
 - conditional build: no_gnome
@@ -1324,7 +1327,7 @@
 - release 2: rebuild against glibc 2.2.
 
 Revision 1.52  2000/11/08 09:29:58  waszi
-- fixed %%doc
+- fixed %doc
 
 Revision 1.51  2000/11/07 18:09:15  baggins
 - removed obsoleted canonname patch
@@ -1340,8 +1343,8 @@
 - rebuild openssh-gnome-askpass against gnome-libs linked with db3.
 
 Revision 1.48  2000/10/28 19:17:25  misiek
-added openssh-canonname.patch
-release 3
+- added openssh-canonname.patch
+- release 3
 
 Revision 1.47  2000/09/12 15:38:58  kloczek
 - adapterized.
@@ -1372,10 +1375,10 @@
 - updated to 2.1.1p1
 
 Revision 1.39  2000/06/09 07:54:45  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.38  2000/06/09 07:23:27  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.37  2000/05/31 11:15:12  bonkey
 - upgrade to 2.1.0p3
@@ -1389,7 +1392,7 @@
 - prereq: pam (for ssh-keygen)
 
 Revision 1.34  2000/05/22 10:23:48  wiget
-2.1.0p2
+- 2.1.0p2
 
 Revision 1.33  2000/05/21 00:14:05  kloczek
 - spec adapterized.
@@ -1411,10 +1414,10 @@
 - spec adapterized.
 
 Revision 1.27  2000/05/10 20:13:22  kravietz
-fixes
+- fixes
 
 Revision 1.26  2000/05/10 17:21:15  kravietz
-Upgrade to OpenSSH-2.1.0
+- Upgrade to OpenSSH-2.1.0
 
 Revision 1.25  2000/04/25 20:26:56  zagrodzki
 - Prereq: openssl
@@ -1447,7 +1450,7 @@
 - translated kloczkish into english
 
 Revision 1.17  2000/03/08 12:35:44  wiget
-1.2.2p1
+- 1.2.2p1
 
 Revision 1.16  2000/02/19 10:34:08  kloczek
 - release 3.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openssh.spec?r1=1.247&r2=1.248&f=u

More information about the pld-cvs-commit mailing list