rpms/apg/devel apg.xinetd, NONE, 1.1 .cvsignore, 1.2, 1.3 apg.spec, 1.6, 1.7 sources, 1.2, 1.3

[Oliver Falk (oliver)]

Author: oliver

Update of /cvs/extras/rpms/apg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7930

Modified Files:
	.cvsignore apg.spec sources 
Added Files:
	apg.xinetd 
Log Message:

Update of apg from v2.2.3 to 2.3.0b

Specfile changelog:
* Mon Apr 11 2005 Oliver Falk <oliver at linux-kernel.at>                                - 2.3.0b-1
- Merge FC devel specfile with lkernAT specfile (=> update)
- Has now support for xinetd



--- NEW FILE apg.xinetd ---
# default: off
# description: A password generator
service pwdgen
{
        disable         = yes
        socket_type     = stream
        wait            = no
        user            = root
        server          = /usr/sbin/apgd
        server_args     = -M sncl -EO -a 0 -r /usr/share/dict/words -m 8 -x 8 -t
        log_on_failure  += USERID
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:02:49 -0000	1.2
+++ .cvsignore	11 Apr 2005 12:34:19 -0000	1.3
@@ -1 +1 @@
-apg-2.2.3.tar.gz
+apg-2.3.0b.tar.gz


Index: apg.spec
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apg.spec	6 Apr 2005 22:11:10 -0000	1.6
+++ apg.spec	11 Apr 2005 12:34:19 -0000	1.7
@@ -1,55 +1,68 @@
-Name:           apg
-Version:        2.2.3
-Release:        4
-
-Summary:        Automated Password Generator for random password generation
-
-Group:          System Environment/Base
-License:        GPL
-URL:            http://www.adel.nursat.kz/apg/
-Source0:        http://www.adel.nursat.kz/apg/download/apg-2.2.3.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:		Automated Password Generator for random password generation
+Name:			apg
+
+Version:		2.3.0b
+Release:		1
+
+License:		GPL
+Group:			System Environment/Base
+URL:			http://www.adel.nursat.kz/%{name}/
+
+Source0:		http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz
+Source1:		apg.xinetd
+
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 APG (Automated Password Generator) is the tool set for random password
 generation. This standalone version generates some random words of
 required type and prints them to standard output.
 
-
-
 %prep
 %setup -q
-# Fix permissions (2.2.3)
-chmod -R u+w .
-
-
 
 %build
-make %{?_smp_mflags} standalone
-
+# Build server
+make %{?_smp_mflags} cliserv
 
+# Build standalone files
+make %{?_smp_mflags} standalone
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-install -D -m0755 apg ${RPM_BUILD_ROOT}%{_bindir}/apg
-install -D -m0644 doc/man/apg.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/apg.1
-
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+install -D apg %{buildroot}%{_bindir}/apg
+install -D apgbfm %{buildroot}%{_bindir}/apgbfm
+install -D apgd %{buildroot}%{_sbindir}/apgd
+install -D doc/man/apg.1 %{buildroot}%{_mandir}/man1/apg.1
+install -D doc/man/apgbfm.1 %{buildroot}%{_mandir}/man1/apgbfm.1
+install -D doc/man/apgd.8 %{buildroot}%{_mandir}/man8/apgd.8
 
+install -D %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/apgd
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+%post
+# add a service for apg if it doesn't already exist
+if ! grep -q ^pwdgen /etc/services; then
+    echo -e 'pwdgen\t\t129/tcp\t\t\t# PWDGEN service' >> /etc/services
+fi
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(-, root, root)
 %doc CHANGES COPYING README THANKS TODO doc/rfc*
 %{_bindir}/apg
-%{_mandir}/man1/*
-
-
+%{_bindir}/apgbfm
+%{_sbindir}/apgd
+%{_mandir}/man*/*
+%{_sysconfdir}/xinetd.d/apgd
 
 %changelog
+* Mon Apr 11 2005 Oliver Falk <oliver at linux-kernel.at>				- 2.3.0b-1
+- Merge FC devel specfile with lkernAT specfile (=> update)
+- Has now support for xinetd
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:02:49 -0000	1.2
+++ sources	11 Apr 2005 12:34:19 -0000	1.3
@@ -1 +1 @@
-3b3fc4f11e90635519fe627c1137c9ac  apg-2.2.3.tar.gz
+3f9301ab654e15ea258d3904c8669a25  apg-2.3.0b.tar.gz