CVS: sidai/package john-the-ripper.xml,1.11,1.12 openssh.xml,1.31,1.32 openssl.xml,1.22,1.23 python.xml,1.26,1.27

[Will P. <pa...@us...>]

Update of /cvsroot/ark/sidai/package
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/package

Modified Files:
	john-the-ripper.xml openssh.xml openssl.xml python.xml 
Log Message:
updates

Index: john-the-ripper.xml
===================================================================
RCS file: /cvsroot/ark/sidai/package/john-the-ripper.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** john-the-ripper.xml	16 Nov 2005 14:20:18 -0000	1.11
--- john-the-ripper.xml	7 Feb 2006 11:40:21 -0000	1.12
***************
*** 83,87 ****
  
    nice ./john whatever-file
- 
  </notes>
  
--- 83,86 ----
***************
*** 99,102 ****
--- 98,105 ----
  
  case "$PKG_VERSION" in
+   1.7*) # hope it's OK
+ 	exit 0
+ 	;;
+ 
    1.6.3[9876]) # drop through to the patch
  	 ;;

Index: openssh.xml
===================================================================
RCS file: /cvsroot/ark/sidai/package/openssh.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** openssh.xml	11 Jul 2005 09:07:10 -0000	1.31
--- openssh.xml	7 Feb 2006 11:40:21 -0000	1.32
***************
*** 87,91 ****
  <!-- ........................................ -->
  <install-bits>
!   <param name="target">install-nokeys</param>
  </install-bits>
  
--- 87,91 ----
  <!-- ........................................ -->
  <install-bits>
!   <param name="target">install-nosysconf</param>
  </install-bits>
  
***************
*** 108,112 ****
  PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"`
  
! if [ "$PKG_VERSION" = "3.9p1" -o "$PKG_VERSION" = "3.8.1p1" -o "$PKG_VERSION" = "3.7.1p2" ] ; then
  $PATCH -p0 <<\EOPATCH
  diff -ru1 ../openssh-3.7p1/Makefile.in ./Makefile.in
--- 108,120 ----
  PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"`
  
! case "$PKG_VERSION" in
!   4.?p?) # drop through to the patch
! 	 ;;
!   *)     # nothing to do
!          echo "do not how how to patch version $PKG_VERSION (maybe too old?)"
!          exit 1
!          ;;
! esac
! 
  $PATCH -p0 <<\EOPATCH
  diff -ru1 ../openssh-3.7p1/Makefile.in ./Makefile.in
***************
*** 117,448 ****
  -	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
   	$(INSTALL) -m 0755 $(STRIP_OPT) ssh $(DESTDIR)$(bindir)/ssh
- @@ -279,32 +278,2 @@
-  	ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
-  
- EOPATCH
- 
- elif [ "$PKG_VERSION" = "3.6.1p2" -o "$PKG_VERSION" = "3.5p1" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-3.5p1/Makefile.in ./Makefile.in
- --- ../openssh-3.5p1/Makefile.in	2002-07-14 18:02:21.000000000 +0100
- +++ ./Makefile.in	2002-10-17 22:06:46.274606000 +0100
- @@ -218,3 +218,2 @@
-  	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
- -	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
-  	$(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
- @@ -251,33 +250,2 @@
-  	ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	@if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	@if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
-  
- EOPATCH
- 
- elif [ "$PKG_VERSION" = "3.4p1" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-3.4p1/Makefile.in ./Makefile.in
- --- ../openssh-3.4p1/Makefile.in	2002-06-21 02:38:53.000000000 +0100
- +++ ./Makefile.in	2002-06-26 11:47:28.583100000 +0100
- @@ -199,3 +199,3 @@
-  
- -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
- +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- @@ -246,33 +246,2 @@
-  	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
-  
- EOPATCH
- 
- #.....................................................................
- elif [ "$PKG_VERSION" = "3.2.2p1" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-3.2.2p1/Makefile.in ./Makefile.in
- --- ../openssh-3.2.2p1/Makefile.in	Tue Feb 26 19:24:22 2002
- +++ ./Makefile.in	Fri Mar  8 11:59:42 2002
- @@ -185,3 +185,3 @@
-  
- -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
- +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- @@ -224,33 +224,2 @@
-  	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
-  
- EOPATCH
- 
- #.....................................................................
- elif [ "$PKG_VERSION" = "3.1p1" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-3.1p1/Makefile.in ./Makefile.in
- --- ../openssh-3.1p1/Makefile.in	Tue Feb 26 19:24:22 2002
- +++ ./Makefile.in	Fri Mar  8 11:59:42 2002
- @@ -185,3 +185,3 @@
-  
- -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
- +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- @@ -224,33 +224,2 @@
-  	ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
-  
  EOPATCH
- 
- #.....................................................................
- elif [ "$PKG_VERSION" = "3.0.2p1" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-3.0.2p1/Makefile.in ./Makefile.in
- --- ../openssh-3.0.2p1/Makefile.in	Mon Oct 22 01:53:59 2001
- +++ ./Makefile.in	Sun Nov 11 20:16:46 2001
- @@ -178,3 +178,3 @@
-  
- -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
- +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
- @@ -215,33 +215,2 @@
-  	#@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
- -	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- -		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- -		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- -		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- -	fi
- -	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- -		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- -		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- -			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- -		else \
- -			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- -		fi ; \
- -	fi
- -	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- -		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- -			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- -			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- -		else \
- -			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- -		fi ; \
- -	else \
- -		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- -	fi
- EOPATCH
- 
- #.....................................................................
- elif [ "$PKG_VERSION" = "2.9.9p2" ] ; then
- $PATCH -p0 <<\EOPATCH
- diff -ru1 ../openssh-2.9.9p2/Makefile.in ./Makefile.in
- diff -r -C 2 ../openssh-2.9.9p2/Makefile.in ./Makefile.in
- *** ../openssh-2.9.9p2/Makefile.in	Tue Sep 18 06:06:22 2001
- --- ./Makefile.in	Tue Oct  9 18:13:53 2001
- ***************
- *** 174,178 ****
-   	(cd scard ; $(MAKE) -f Makefile.in distprep)
-   
- ! install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
-   install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-   
- --- 174,178 ----
-   	(cd scard ; $(MAKE) -f Makefile.in distprep)
-   
- ! install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-   install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-   
- ***************
- *** 214,245 ****
-   		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
-   	fi
- - 	if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \
- - 		$(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
- - 	else \
- - 		echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \
- - 	fi
- - 	if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
- - 		$(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
- - 	else \
- - 		echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
- - 	fi
- - 	if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
- - 		$(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
- - 		if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
- - 			$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
- - 		else \
- - 			echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
- - 		fi ; \
- - 	fi
- - 	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
- - 		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- - 			echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
- - 			mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
- - 		else \
- - 			$(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
- - 		fi ; \
- - 	else \
- - 		echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
- - 	fi
-   
-   host-key: ssh-keygen$(EXEEXT)
- --- 214,217 ----
- EOPATCH
- 
- #.....................................................................
- else
-     echo "do not how how to patch version $PKG_VERSION"
-     exit 1
- fi
  ]]></code></patch>
  
--- 125,129 ----

Index: openssl.xml
===================================================================
RCS file: /cvsroot/ark/sidai/package/openssl.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** openssl.xml	30 Jul 2005 12:35:33 -0000	1.22
--- openssl.xml	7 Feb 2006 11:40:21 -0000	1.23
***************
*** 90,96 ****
    <constraint><dependency type="essential" name="." on-method="host-linkfarm" /></constraint>
  
-   <!-- strange constraint, but apparently true -->
-   <constraint><dependency type="normal" name="perl" /></constraint>
- 
    <param name="PKG_PROTO_HOST">!proxy_for.idString</param>
    <param name="FIND">@proxy-host:FIND@</param>
--- 90,93 ----

Index: python.xml
===================================================================
RCS file: /cvsroot/ark/sidai/package/python.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** python.xml	16 Nov 2005 14:20:18 -0000	1.26
--- python.xml	7 Feb 2006 11:40:21 -0000	1.27
***************
*** 161,165 ****
  # NB: there may be arbitrary weird stuff here; check closely
  
! if [ "$PKG_VERSION" = "2.3.4" ] ; then
  
  $PATCH -p0 <<\EOPATCH
--- 161,455 ----
  # NB: there may be arbitrary weird stuff here; check closely
  
! if [ "$PKG_VERSION" = "2.4.2" ] ; then
! 
! $PATCH -p0 <<\EOPATCH
! diff -rU1 ../python-2.4.2/Modules/getpath.c ./Modules/getpath.c
! --- ../python-2.4.2/Modules/getpath.c	2004-08-08 02:00:47.000000000 +0100
! +++ ./Modules/getpath.c	2005-11-19 10:44:23.000000000 +0000
! @@ -284,2 +284,4 @@
!      /* Search from argv0_path, until root is found */
! +#if 0
! +    /* partain: no */
!      copy_absolute(prefix, argv0_path);
! @@ -294,2 +296,3 @@
!      } while (prefix[0]);
! +#endif
!  
! @@ -337,2 +340,4 @@
!      /* Search from argv0_path, until root is found */
! +#if 0
! +    /* partain: no */
!      copy_absolute(exec_prefix, argv0_path);
! @@ -347,2 +352,3 @@
!      } while (exec_prefix[0]);
! +#endif
!  
! diff -rU1 ../python-2.4.2/setup.py ./setup.py
! --- ../python-2.4.2/setup.py	2005-03-09 22:27:24.000000000 +0000
! +++ ./setup.py	2005-11-19 10:49:52.000000000 +0000
! @@ -38,8 +38,3 @@
!  
! -    # Check the standard locations
! -    for dir in std_dirs:
! -        f = os.path.join(dir, filename)
! -        if os.path.exists(f): return []
! -
! -    # Check the additional directories
! +    # Check the additional directories [partain:we prefer these]
!      for dir in paths:
! @@ -49,2 +44,7 @@
!  
! +    # Check the standard locations
! +    for dir in std_dirs:
! +        f = os.path.join(dir, filename)
! +        if os.path.exists(f): return []
! +
!      # Not found anywhere
! @@ -241,4 +241,4 @@
!          # Ensure that /usr/local is always used
! -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
! -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
! +#        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
! +#        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
!  
! @@ -268,8 +268,23 @@
!          lib_dirs = self.compiler.library_dirs + [
! -            '/lib64', '/usr/lib64',
! -            '/lib', '/usr/lib',
! +#            '/lib64', '/usr/lib64',
! +#            '/lib', '/usr/lib',
!              ]
! -        inc_dirs = self.compiler.include_dirs + ['/usr/include']
! +        inc_dirs = self.compiler.include_dirs # + ['/usr/include']
!          exts = []
!  
! +        import string
! +        flags = open('Iflags')
! +        for i in string.split(flags.read(),' '):
! +            if i[0:2] != '-I': raise 'odd Iflag'+i
! +            inc_dirs.append(i[2:])
! +	flags.close()
! +        flags = open('Lflags')
! +        for i in string.split(flags.read(),' '):
! +            if i[0:6] == '-Wl,-R': continue
! +            if i      == '-Wl,+b,:\n': continue
! +            if i[0:2] != '-L': raise 'odd Lflag'+i
! +            lib_dirs.append(i[2:])
! +	flags.close()
! +        #debug:sys.stderr.write('Iflags=%s, Lflags=%s\n'%(`inc_dirs`,`lib_dirs`))
! +
!          platform = self.get_platform()
! @@ -423,11 +438,11 @@
!          # readline
! -        if self.compiler.find_library_file(lib_dirs, 'readline'):
! +        if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'readline'):
!              readline_libs = ['readline']
! -            if self.compiler.find_library_file(lib_dirs,
! +            if self.compiler.find_library_file(lib_dirs+['/usr/lib'],
!                                                   'ncurses'):
!                  readline_libs.append('ncurses')
! -            elif self.compiler.find_library_file(lib_dirs, 'curses'):
! +            elif self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'curses'):
!                  readline_libs.append('curses')
!              elif self.compiler.find_library_file(lib_dirs +
! -                                               ['/usr/lib/termcap'],
! +                                               ['/usr/lib/termcap','/usr/lib'],
!                                                 'termcap'):
! @@ -435,3 +450,5 @@
!              exts.append( Extension('readline', ['readline.c'],
! -                                   library_dirs=['/usr/lib/termcap'],
! +                                   include_dirs=inc_dirs,
! +                                   library_dirs=['/usr/lib/termcap']+lib_dirs,
! +				   runtime_library_dirs=lib_dirs,
!                                     libraries=readline_libs) )
! @@ -440,3 +457,3 @@
!  
! -            if self.compiler.find_library_file(lib_dirs, 'crypt'):
! +            if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'crypt'):
!                  libs = ['crypt']
! @@ -453,5 +470,5 @@
!          # Detect SSL support for the socket module (via _ssl)
! -        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
! -                             ['/usr/local/ssl/include',
! -                              '/usr/contrib/ssl/include/'
! +        ssl_incs = find_file('openssl/ssl.h', inc_dirs+['/usr/include'],
! +                             [#'/usr/local/ssl/include',
! +                              #'/usr/contrib/ssl/include/'
!                               ]
! @@ -459,3 +476,3 @@
!          if ssl_incs is not None:
! -            krb5_h = find_file('krb5.h', inc_dirs,
! +            krb5_h = find_file('krb5.h', inc_dirs+['/usr/include'],
!                                 ['/usr/kerberos/include'])
! @@ -464,4 +481,4 @@
!          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
! -                                     ['/usr/local/ssl/lib',
! -                                      '/usr/contrib/ssl/lib/'
! +                                     [#'/usr/local/ssl/lib',
! +                                      #'/usr/contrib/ssl/lib/'
!                                       ] )
! @@ -471,4 +488,5 @@
!              exts.append( Extension('_ssl', ['_ssl.c'],
! -                                   include_dirs = ssl_incs,
! -                                   library_dirs = ssl_libs,
! +                                   include_dirs = inc_dirs,
! +                                   library_dirs = lib_dirs,
! +                                   runtime_library_dirs = lib_dirs,
!                                     libraries = ['ssl', 'crypto'],
! @@ -498,23 +516,23 @@
!          db_inc_paths = [
! -            '/usr/include/db4',
! -            '/usr/local/include/db4',
! -            '/opt/sfw/include/db4',
! -            '/sw/include/db4',
! -            '/usr/include/db3',
! -            '/usr/local/include/db3',
! -            '/opt/sfw/include/db3',
! -            '/sw/include/db3',
! +#            '/usr/include/db4',
! +#            '/usr/local/include/db4',
! +#            '/opt/sfw/include/db4',
! +#            '/sw/include/db4',
! +#            '/usr/include/db3',
! +#            '/usr/local/include/db3',
! +#            '/opt/sfw/include/db3',
! +#            '/sw/include/db3',
!          ]
!          # 4.x minor number specific paths
! -        for x in (0,1,2,3):
! -            db_inc_paths.append('/usr/include/db4%d' % x)
! -            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
! -            db_inc_paths.append('/usr/local/include/db4%d' % x)
! -            db_inc_paths.append('/pkg/db-4.%d/include' % x)
! -        # 3.x minor number specific paths
! -        for x in (2,3):
! -            db_inc_paths.append('/usr/include/db3%d' % x)
! -            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
! -            db_inc_paths.append('/usr/local/include/db3%d' % x)
! -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
! +#         for x in (0,1,2,3):
! +#             db_inc_paths.append('/usr/include/db4%d' % x)
! +#             db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
! +#             db_inc_paths.append('/usr/local/include/db4%d' % x)
! +#             db_inc_paths.append('/pkg/db-4.%d/include' % x)
! +#         # 3.x minor number specific paths
! +#         for x in (2,3):
! +#             db_inc_paths.append('/usr/include/db3%d' % x)
! +#             db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
! +#             db_inc_paths.append('/usr/local/include/db3%d' % x)
! +#             db_inc_paths.append('/pkg/db-3.%d/include' % x)
!  
! @@ -594,5 +612,6 @@
!              exts.append(Extension('_bsddb', ['_bsddb.c'],
! -                                  library_dirs=dblib_dir,
! -                                  runtime_library_dirs=dblib_dir,
! -                                  include_dirs=db_incs,
! +                                  # NB: ignore what the searching {didn't find,found}
! +                                  library_dirs=lib_dirs,
! +                                  runtime_library_dirs=lib_dirs,
! +                                  include_dirs=inc_dirs,
!                                    libraries=dblibs))
! @@ -629,5 +648,5 @@
!          if platform not in ['cygwin']:
! -            if find_file("ndbm.h", inc_dirs, []) is not None:
! +            if find_file("ndbm.h", inc_dirs+['/usr/include'], []) is not None:
!                  # Some systems have -lndbm, others don't
! -                if self.compiler.find_library_file(lib_dirs, 'ndbm'):
! +                if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'ndbm'):
!                      ndbm_libs = ['ndbm']
! @@ -638,4 +657,4 @@
!                                         libraries = ndbm_libs ) )
! -            elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
! -                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
! +            elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'gdbm')
! +                  and find_file("gdbm/ndbm.h", inc_dirs+['/usr/include'], []) is not None):
!                  exts.append( Extension('dbm', ['dbmmodule.c'],
! @@ -653,3 +672,3 @@
!          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
! -        if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
! +        if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'gdbm')):
!              exts.append( Extension('gdbm', ['gdbmmodule.c'],
! @@ -667,3 +686,3 @@
!              if platform not in ['cygwin', 'atheos']:
! -                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
! +                if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'nsl')):
!                      libs = ['nsl']
! @@ -676,3 +695,3 @@
!          # provided by the ncurses library.
! -        if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
! +        if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'ncurses')):
!              curses_libs = ['ncurses']
! @@ -680,3 +699,3 @@
!                                     libraries = curses_libs) )
! -        elif (self.compiler.find_library_file(lib_dirs, 'curses')
! +        elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'curses')
!                and platform != 'darwin'):
! @@ -684,5 +703,5 @@
!                  # the _curses module.
! -            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
! +            if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'terminfo')):
!                  curses_libs = ['curses', 'terminfo']
! -            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
! +            elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'termcap')):
!                  curses_libs = ['curses', 'termcap']
! @@ -696,3 +715,3 @@
!          if (module_enabled(exts, '_curses') and
! -            self.compiler.find_library_file(lib_dirs, 'panel')):
! +            self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'panel')):
!              exts.append( Extension('_curses_panel', ['_curses_panel.c'],
! @@ -713,5 +732,8 @@
!          # http://www.gzip.org/zlib/
! -        zlib_inc = find_file('zlib.h', [], inc_dirs)
! +        zlib_inc = find_file('zlib.h', ['/usr/include'], inc_dirs)
!          if zlib_inc is not None:
! -            zlib_h = zlib_inc[0] + '/zlib.h'
! +            if len(zlib_inc) == 0:
! +                zlib_h = '/usr/include/zlib.h'
! +            else:
! +                zlib_h = zlib_inc[0] + '/zlib.h'
!              version = '"0.0.0"'
! @@ -727,4 +749,7 @@
!              if version >= version_req:
! -                if (self.compiler.find_library_file(lib_dirs, 'z')):
! +                if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'z')):
!                      exts.append( Extension('zlib', ['zlibmodule.c'],
! +                                   include_dirs=inc_dirs,
! +				   library_dirs=lib_dirs,
! +				   runtime_library_dirs=lib_dirs,
!                                             libraries = ['z']) )
! @@ -732,4 +757,7 @@
!          # Gustavo Niemeyer's bz2 module.
! -        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
! +        if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'bz2')):
!              exts.append( Extension('bz2', ['bz2module.c'],
! +                                   library_dirs=lib_dirs,
! +                                   runtime_library_dirs=lib_dirs,
! +                                   include_dirs=inc_dirs,
!                                     libraries = ['bz2']) )
! @@ -784,3 +812,3 @@
!              # This requires sizeof(int) == sizeof(long) == sizeof(char*)
! -            dl_inc = find_file('dlfcn.h', [], inc_dirs)
! +            dl_inc = find_file('dlfcn.h', ['/usr/include'], inc_dirs)
!              if (dl_inc is not None) and (platform not in ['atheos', 'darwin']):
! @@ -980,4 +1008,4 @@
!                          '82', '8.1', '81', '8.0', '80']:
! -            tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
! -            tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
! +            tklib = self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'tk' + version)
! +            tcllib = self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'tcl' + version)
!              if tklib and tcllib:
! @@ -1039,3 +1067,3 @@
!          # Check for BLT extension
! -        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
! +        if self.compiler.find_library_file(lib_dirs + added_lib_dirs+['/usr/lib'],
!                                             'BLT8.0'):
! @@ -1043,3 +1071,3 @@
!              libs.append('BLT8.0')
! -        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
! +        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs+['/usr/lib'],
!                                             'BLT'):
! EOPATCH
! 
! elif [ "$PKG_VERSION" = "2.3.4" ] ; then
  
  $PATCH -p0 <<\EOPATCH