bootdisk/trunk/batch-installer/installer-dest

2006-03-19 Thread hawk 
Author: hawk
Date: Sun Mar 19 22:22:17 2006
New Revision: 7240

Modified:
   bootdisk/trunk/batch-installer/installer-dest
Log:
- test if /dest/proc exists, we might be installing using
  existing filesystem


Modified: bootdisk/trunk/batch-installer/installer-dest
==
--- bootdisk/trunk/batch-installer/installer-dest   (original)
+++ bootdisk/trunk/batch-installer/installer-dest   Sun Mar 19 22:22:17 2006
@@ -719,6 +719,6 @@
 fi
 
 
-   mkdir /dest/proc
+   test -d /dest/proc || mkdir /dest/proc
mount -t proc none /dest/proc
 # vim:ft=sh
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/installer-boot

2006-03-19 Thread hawk 
Author: hawk
Date: Sun Mar 19 22:43:17 2006
New Revision: 7241

Modified:
   bootdisk/trunk/batch-installer/installer-boot
Log:
- create symlinks only if they don't exist


Modified: bootdisk/trunk/batch-installer/installer-boot
==
--- bootdisk/trunk/batch-installer/installer-boot   (original)
+++ bootdisk/trunk/batch-installer/installer-boot   Sun Mar 19 22:43:17 2006
@@ -90,8 +90,8 @@
 # since kernel24 package creates /boot/vmlinuz24, we must create
 # vmlinuz symlink
 if test -f /dest/boot/vmlinuz24 ; then
-ln -s vmlinuz24 /dest/boot/vmlinuz
-ln -s initrd24 /dest/boot/initrd
+test -f /dest/boot/vmlinuz || ln -s vmlinuz24 /dest/boot/vmlinuz
+test -f /dest/boot/initrd || ln -s initrd24 /dest/boot/initrd
 fi
 
 case $dest_boot_device in
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/installer-pkgs

2006-03-19 Thread hawk 
Author: hawk
Date: Sun Mar 19 22:45:22 2006
New Revision: 7242

Modified:
   bootdisk/trunk/batch-installer/installer-pkgs
Log:
- allow to finish installation process when package installation
  has returned some error value


Modified: bootdisk/trunk/batch-installer/installer-pkgs
==
--- bootdisk/trunk/batch-installer/installer-pkgs   (original)
+++ bootdisk/trunk/batch-installer/installer-pkgs   Sun Mar 19 22:45:22 2006
@@ -248,7 +248,11 @@
  log error $(nls You might want to try installing just basic 
packages,)
  log error $(nls and install rest after reboot.)
  cat $poldek_log  /var/log/installer
- exit 1
+ nls 'Do you wish to continue installation process anyway? '
+ read ans
+ if [ $ans != y ]  [ $ans != Y ]; then
+   exit 1
+ fi
fi
;;
 *)
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/pci/sh-scan-pci.list-net

2006-03-19 Thread hawk 
Author: hawk
Date: Sun Mar 19 23:50:37 2006
New Revision: 7244

Modified:
   bootdisk/trunk/batch-installer/pci/sh-scan-pci.list-net
Log:
- updated from HEAD pci-database


Modified: bootdisk/trunk/batch-installer/pci/sh-scan-pci.list-net
==
--- bootdisk/trunk/batch-installer/pci/sh-scan-pci.list-net (original)
+++ bootdisk/trunk/batch-installer/pci/sh-scan-pci.list-net Sun Mar 19 
23:50:37 2006
@@ -247,13 +247,14 @@
 14b94800 airo AIRONET Wireless Communications|Cisco Aironet 340 802.11b 
Wireless LAN Adapter/Aironet PC4800
 14b95000 airo AIRONET Wireless Communications|
 14b9a504 airo AIRONET Wireless Communications|Cisco Aironet Wireless 802.11b
+14e41600 tg3 Broadcom Corporation|NetXtreme BCM5752 Gigabit Ethernet PCI 
Express
+14e41601 tg3 Broadcom Corporation|NetXtreme BCM5752M Gigabit Ethernet PCI 
Express
 14e41644 tg3 Broadcom Corporation|NetXtreme BCM5700 Gigabit Ethernet
 14e41645 tg3 Broadcom Corporation|NetXtreme BCM5701 Gigabit Ethernet
 14e41646 tg3 Broadcom Corporation|NetXtreme BCM5702 Gigabit Ethernet
 14e41647 tg3 Broadcom Corporation|NetXtreme BCM5703 Gigabit Ethernet
 14e41648 tg3 Broadcom Corporation|NetXtreme BCM5704 Gigabit Ethernet
 14e41649 tg3 Broadcom Corporation|
-14e4164a tg3 Broadcom Corporation|NetXtreme II BCM5706 Gigabit Ethernet
 14e4164d tg3 Broadcom Corporation|NetXtreme BCM5702FE Gigabit Ethernet
 14e41653 tg3 Broadcom Corporation|NetXtreme BCM5705 Gigabit Ethernet
 14e41654 tg3 Broadcom Corporation|NetXtreme BCM5705_2 Gigabit Ethernet
@@ -261,6 +262,8 @@
 14e41659 tg3 Broadcom Corporation|NetXtreme BCM5721 Gigabit Ethernet PCI 
Express
 14e4165d tg3 Broadcom Corporation|NetXtreme BCM5705M Gigabit Ethernet
 14e4165e tg3 Broadcom Corporation|NetXtreme BCM5705M_2 Gigabit Ethernet
+14e4166a tg3 Broadcom Corporation|NetXtreme BCM5780 Gigabit Ethernet
+14e4166b tg3 Broadcom Corporation|NetXtreme BCM5780S Gigabit Ethernet
 14e4166e tg3 Broadcom Corporation|570x 10/100 Integrated Controller
 14e41676 tg3 Broadcom Corporation|
 14e41677 tg3 Broadcom Corporation|NetXtreme BCM5751 Gigabit Ethernet PCI 
Express
@@ -273,7 +276,6 @@
 14e416a6 tg3 Broadcom Corporation|NetXtreme BCM5702X Gigabit Ethernet
 14e416a7 tg3 Broadcom Corporation|NetXtreme BCM5703X Gigabit Ethernet
 14e416a8 tg3 Broadcom Corporation|NetXtreme BCM5704S Gigabit Ethernet
-14e416aa tg3 Broadcom Corporation|NetXtreme II BCM5706S Gigabit Ethernet
 14e416c6 tg3 Broadcom Corporation|NetXtreme BCM5702A3 Gigabit Ethernet
 14e416c7 tg3 Broadcom Corporation|NetXtreme BCM5703 Gigabit Ethernet
 14e416dd tg3 Broadcom Corporation|NetLink BCM5781 Gigabit Ethernet PCI Express
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/mini-iso.lst - added hdparm

2006-03-19 Thread hawk 
Author: hawk Date: Sun Mar 19 23:34:34 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- added hdparm

 Files affected:
admin/ftp:
   mini-iso.lst (1.17.2.5 - 1.17.2.6) 

 Diffs:


Index: admin/ftp/mini-iso.lst
diff -u admin/ftp/mini-iso.lst:1.17.2.5 admin/ftp/mini-iso.lst:1.17.2.6
--- admin/ftp/mini-iso.lst:1.17.2.5 Sun Mar 19 21:45:37 2006
+++ admin/ftp/mini-iso.lst  Mon Mar 20 00:34:29 2006
@@ -22,6 +22,7 @@
 grep
 groff
 gzip
+hdparm
 iproute2
 iputils-ping
 issue


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/mini-iso.lst?r1=1.17.2.5r2=1.17.2.6f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/poldek-iso.priority - keep hdparm on first CD

2006-03-19 Thread hawk 
Author: hawk Date: Sun Mar 19 23:35:04 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- keep hdparm on first CD

 Files affected:
admin/ftp:
   poldek-iso.priority (1.8.2.9 - 1.8.2.10) 

 Diffs:


Index: admin/ftp/poldek-iso.priority
diff -u admin/ftp/poldek-iso.priority:1.8.2.9 
admin/ftp/poldek-iso.priority:1.8.2.10
--- admin/ftp/poldek-iso.priority:1.8.2.9   Sun Mar 19 21:48:01 2006
+++ admin/ftp/poldek-iso.priority   Mon Mar 20 00:34:59 2006
@@ -44,6 +44,7 @@
 grub   -5
 gzip   -5
 hc-cron-5
+hdparm -5
 hexedit-5
 hfsprogs   -5
 info   -5


 CVS-web:

http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.9r2=1.8.2.10f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/installer-prep

2006-03-19 Thread hawk 
Author: hawk
Date: Mon Mar 20 00:50:02 2006
New Revision: 7246

Modified:
   bootdisk/trunk/batch-installer/installer-prep
Log:
- cosmetics


Modified: bootdisk/trunk/batch-installer/installer-prep
==
--- bootdisk/trunk/batch-installer/installer-prep   (original)
+++ bootdisk/trunk/batch-installer/installer-prep   Mon Mar 20 00:50:02 2006
@@ -444,7 +444,7 @@
   # also write entries to modules.conf/modprobe.conf
   for ide in $detected_ide; do
 if echo $1 | grep -q $ide; then
-  # if not ide-generit then write info about ide adapters
+  # if not ide-generic then write info about ide adapters
   # into modules.conf/modprobe.conf
   if test x$ide != xide-generic; then
 for i in /etc/modules.conf /etc/modprobe.conf; do
@@ -473,7 +473,9 @@
 fi
   done
 
-  # same for scsi
+  # check if any of modules to be loaded is for SCSI device
+  # and if it is, load module sd_mod, also write entries to
+  # modules.conf/modprobe.conf
   for scsi in $detected_scsi; do
 if echo $1 | grep -q $scsi; then
   for i in /etc/modules.conf /etc/modprobe.conf; do
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui/ui-wizard

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 15:26:52 2006
New Revision: 7256

Modified:
   bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- more specific DMA information
- don't set install type LAST while we weren't installing yet


Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Mar 21 15:26:52 2006
@@ -152,7 +152,7 @@
   item id=ide-generic checked=0$(nls Generic IDE driver)
 /menubr
 check id=ide_dma checked=$dma 
-$(nls Try to enable DMA for IDE devices)
+$(nls Try to enable DMA for IDE devices during installation)
 brbr
 $ok_cancel
 EOF
@@ -880,20 +880,13 @@
   pkgsets=`cat $pkgsetsdir/.list`
 
   if [ $last_pkg_set =  ] ; then
-# if /etc/installer.pkgs contains basic pkgset, we can select it
-# or mini-iso, otherwise config was loaded from disk or created
-# using some other way and we shouldn't touch it unless explicitly
-# told to.
+# if /etc/installer.pkgs contains basic pkgset, or mini-iso we
+# may preselect it, otherwise config was loaded from disk or created
+# using some other way and we shouldn't touch it
 if [ $(md5 $pkgsetsdir/base) = $(md5 $pkgsfile) ] ; then
-  if test -f /tmp/is-mini-iso ; then
-last_pkg_set=$pkgsetsdir/MINI-ISO
-  else
-last_pkg_set=$pkgsetsdir/base
-  fi
-else
-  last_pkg_set=$pkgsetsdir/LAST
-  cp $pkgsfile $last_pkg_set
-  pkgsets=$pkgsets LAST
+  last_pkg_set=$pkgsetsdir/base
+elif [ $(md5 $pkgsetsdir/MINI-ISO) = $(md5 $pkgsfile) ] ; then
+  last_pkg_set=$pkgsetsdir/MINI-ISO
 fi
   fi
   echo meta active=pkg_set
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/po/pl.po

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 15:40:06 2006
New Revision: 7259

Modified:
   bootdisk/trunk/batch-installer/po/pl.po
Log:
- updated


Modified: bootdisk/trunk/batch-installer/po/pl.po
==
--- bootdisk/trunk/batch-installer/po/pl.po (original)
+++ bootdisk/trunk/batch-installer/po/pl.po Tue Mar 21 15:40:06 2006
@@ -4,7 +4,7 @@
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 POT-Creation-Date: 1999-07-30 18:45+0200\n
-PO-Revision-Date: 2006-03-21 15:27+0200\n
+PO-Revision-Date: 2006-03-21 15:38+0200\n
 Last-Translator: Marcin Król [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n
 MIME-Version: 1.0\n
@@ -2505,6 +2505,14 @@
 msgid Add optional packages when selecting group
 msgstr Dodaj opcjonalne pakiety podczas zaznaczania grupy
 
+#: ../../batch-installer/ui/ui-pkgs:401
+msgid standard
+msgstr standardowe
+
+#: ../../batch-installer/ui/ui-pkgs:402
+msgid optional
+msgstr opcjonalne
+
 #: ../../batch-installer/ui/ui-pkgs:408
 msgid Saving package set to %s
 msgstr Zapisuję zestaw pakietów do pliku %s
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui: ui-functions ui-makeform

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 15:25:07 2006
New Revision: 7255

Modified:
   bootdisk/trunk/batch-installer/ui/ui-functions
   bootdisk/trunk/batch-installer/ui/ui-makeform
Log:
- more specific information


Modified: bootdisk/trunk/batch-installer/ui/ui-functions
==
--- bootdisk/trunk/batch-installer/ui/ui-functions  (original)
+++ bootdisk/trunk/batch-installer/ui/ui-functions  Tue Mar 21 15:25:07 2006
@@ -133,7 +133,8 @@
 
 # hostadapters_modules: space delimited list of modules which are required
 #   by your adapters and/or storage devices, example: piix aic7xxx
-# ide_dma: should installer try to enable DMA for IDE devices? yes or no
+# ide_dma: should installer try to enable DMA for IDE devices during
+#   installation? yes or no
 hostadapters_modules=$hostadapters_modules
 ide_dma=$ide_dma
 

Modified: bootdisk/trunk/batch-installer/ui/ui-makeform
==
--- bootdisk/trunk/batch-installer/ui/ui-makeform   (original)
+++ bootdisk/trunk/batch-installer/ui/ui-makeform   Tue Mar 21 15:25:07 2006
@@ -100,7 +100,7 @@
 
 separator $(nls Other options)
 item hostadapters_modules $(nls List of kernel modules for IDE/SCSI/SATA 
adapters) 
-item ide_dma $(nls Try to enable DMA for IDE devices) 
+item ide_dma $(nls Try to enable DMA for IDE devices during installation) 
 item pcmcia_controller $(nls PCMCIA controller, if you have any)
 
 item pkgs_installer $(nls Which installer use to install RPM packages) 
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui/ui-pkgs

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 15:39:38 2006
New Revision: 7258

Modified:
   bootdisk/trunk/batch-installer/ui/ui-pkgs
Log:
- added missing quotes


Modified: bootdisk/trunk/batch-installer/ui/ui-pkgs
==
--- bootdisk/trunk/batch-installer/ui/ui-pkgs   (original)
+++ bootdisk/trunk/batch-installer/ui/ui-pkgs   Tue Mar 21 15:39:38 2006
@@ -399,8 +399,8 @@
 1) break ;;
 2) exit 1 ;;
 3) lists ;;
-4) select_individual standard `nls standard` ;;
-5) select_individual optional `nls optional` ;;
+4) select_individual standard `nls standard` ;;
+5) select_individual optional `nls optional` ;;
 6) : ;;
 esac
 
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui: ui-main ui-wizard

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 22:42:28 2006
New Revision: 7261

Modified:
   bootdisk/trunk/batch-installer/ui/ui-main
   bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- depending on bootdisk type show only available installation source types


Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main   (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main   Tue Mar 21 22:42:28 2006
@@ -72,10 +72,15 @@
 br
 meta title=$(nls Type of installation)
 menu id=res_menu res=1
-item id=cdrom_cdrom: `nls CD-ROM device`
-item id=net_net: `nls network server (ftp, http)`
-item id=nfs_nfs: `nls NFS server`
-item id=disk_disk: `nls Hard disk partition`
+$(
+  if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
+echo item id=cdrom_cdrom: `nls CD-ROM device`
+echo item id=disk_disk: `nls Hard disk partition`
+  elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test 
-f /etc/bootdisk_iso; then
+echo item id=net_net: `nls network server (ftp, http)`
+echo item id=nfs_nfs: `nls NFS server`
+  fi
+)
 /menu 
 $@
 EOF

Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Tue Mar 21 22:42:28 2006
@@ -208,28 +208,30 @@
 meta active=source
 br
 menu id=source res=1002 selected=$source
-item id=cdrom_cdrom: $(nls CD-ROM device)
-item id=net_net: $(nls network server (ftp, http))
-item id=nfs_nfs: $(nls NFS server)
-item id=disk_disk: $(nls Hard disk partition)
+$(
+  if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
+echo item id=cdrom_cdrom: $(nls CD-ROM device)
+echo item id=disk_disk: $(nls Hard disk partition)
+  elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test -f 
/etc/bootdisk_iso; then
+echo item id=net_net: $(nls network server (ftp, http))
+echo item id=nfs_nfs: $(nls NFS server)
+  fi
+)
 /menu
 br
 $(nls Please select device you are going to install from, then press 
brEnter or Next .)
+brbr
+$(
+  if test -f /etc/bootdisk_cd ; then
+echo $(nls For network based installation, please use 
bootdisk_net.imgbror boot your computer from installation CD. If you have 
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
+  elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia ; then
+echo $(nls For CD or disk based installation, please use 
bootdisk_cd.imgbror boot your computer from installation CD.)
+  fi
+)
 EOF
 }
 
 post_source1 () {
-  if [ $source = cdrom ] || [ $source = disk ]; then
-if ! test -f /etc/bootdisk_cd  ! test -f /etc/bootdisk_iso; then
-  info $(nls For CD or disk based installation, please use 
bootdisk_cd.imgbror boot your computer from installation CD.)
-  return 1;
-fi
-  elif [ $source = net ] || [ $source = nfs ]; then
-if ! test -f /etc/bootdisk_net  ! test -f /etc/bootdisk_pcmcia  ! test 
-f /etc/bootdisk_iso; then
-  info $(nls For network based installation, please use 
bootdisk_net.imgbror boot your computer from installation CD. If you have 
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
-  return 1;
-fi
-  fi
 }
 
 ###
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/installer-prep

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 22:47:18 2006
New Revision: 7262

Modified:
   bootdisk/trunk/batch-installer/installer-prep
Log:
- if we are installing from net, try to load modules from net to avoid
  addons juggling (but fallback to addons when network loading fails)
- small cosmetic


Modified: bootdisk/trunk/batch-installer/installer-prep
==
--- bootdisk/trunk/batch-installer/installer-prep   (original)
+++ bootdisk/trunk/batch-installer/installer-prep   Tue Mar 21 22:47:18 2006
@@ -75,46 +75,55 @@
 test -d $modules_dir || die No $modules_dir directory
 
 if test ! -r $modules_dir/${1}.o; then
-   # try to load from addons diskette
-   package=`find_package ${1}`
-   test $package || die No package contains module $1
-   addons=`find_addons $package`
-   test $addons || die No addons disk contains package $package
-   first=yes
-   # the source will be the diskette, temporarily 
-   # (that _is_ mountable)
-   tmp=$source_not_mountable
-   source_not_mountable=
-   while : ; do
-   if grep -q $source_mountpoint /proc/mounts; then
-   umount $source_mountpoint || :
+package=`find_package ${1}`
+test $package || die No package contains module $1
+   # if we are installing from net, try to fetch whole required package
+   # (to avoid fetching it again if some other module from it will be 
needed)
+if test -n $source_not_mountable; then
+   if load_package $package; then
+   tmp=value
fi
-   
-   if mount /dev/fd0 -t ext2 $source_mountpoint 2/dev/null ; then
-   if load_package $package ${1}.o; then 
-   break 
-   else
-   nls This disk does not contain package %s with module 
%s.\n $package $1
+   fi
+   # if fetching from network wasn't executed or has failed, search for
+   # required module on addons disks
+   if test -z $tmp ; then
+   addons=`find_addons $package`
+   test $addons || die No addons disk contains package $package
+   first=yes
+   # the source will be the diskette, temporarily 
+   # (that _is_ mountable)
+   tmp=$source_not_mountable
+   source_not_mountable=
+   while : ; do
+   if grep -q $source_mountpoint /proc/mounts; then
+   umount $source_mountpoint || :
fi
-   else
-   if test ! $first ; then
-   nls Cannot mount diskette!\n
+
+   if mount /dev/fd0 -t ext2 $source_mountpoint 2/dev/null ; then
+   if load_package $package ${1}.o; then 
+   break 
+   else
+   nls This disk does not contain package %s with module 
%s.\n $package $1
+   fi
+   else
+   if test ! $first ; then
+   nls Cannot mount diskette!\n
+   fi
fi
-   fi
-   
-   if test $first ; then
-   nls Module %s is not available, package %s must be loaded.\n 
$1 $package
-   nls Please insert disk \addons %d\ and press Enter\n 
$addons
-   first=
-   else
-   nls Try another disk and press Enter.\n
-   fi
-   read ans
-   done
-   # restore correct value
-   source_not_mountable=$tmp
 
-   umount $source_mountpoint || :
+   if test $first ; then
+   nls Module %s is not available, package %s must be 
loaded.\n $1 $package
+   nls Please insert disk \addons %d\ and press Enter\n 
$addons
+   first=
+   else
+   nls Try another disk and press Enter.\n
+   fi
+   read ans
+   done
+   # restore correct value
+   source_not_mountable=$tmp
+   umount $source_mountpoint || :
+   fi
 fi
 
 # find and load modules on which our wanted module depends
@@ -180,7 +189,10 @@
  ;;
  esac
  snarf -n $file 
-   ) || die Cannot get $file
+   ) || {
+   log warn `nls Cannot get %s $file`
+   return 1
+ }
file=$tmp/${pkg}.tar.gz
 else
file=${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz
@@ -189,7 +201,7 @@
  # try without source_dir (for addons disk)
  file=${source_mountpoint}/$inst_dir/${pkg}.tar.gz
  test -f $file || { 
-   echo No file 
${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz nor 
${source_mountpoint}/$inst_dir/${pkg}.tar.gz
+   log warn `nls No file %s nor %s 
${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz 
${source_mountpoint}/$inst_dir/${pkg}.tar.gz`
return 1

bootdisk/trunk/batch-installer/installer.conf

2006-03-21 Thread hawk 
Author: hawk
Date: Tue Mar 21 22:53:52 2006
New Revision: 7264

Modified:
   bootdisk/trunk/batch-installer/installer.conf
Log:
- more specific information


Modified: bootdisk/trunk/batch-installer/installer.conf
==
--- bootdisk/trunk/batch-installer/installer.conf   (original)
+++ bootdisk/trunk/batch-installer/installer.conf   Tue Mar 21 22:53:52 2006
@@ -4,7 +4,8 @@
 
 # hostadapters_modules: space delimited list of modules which are required
 #   by your adapters and/or storage devices, example: piix aic7xxx
-# ide_dma: should installer try to enable DMA for IDE devices? yes or no
+# ide_dma: should installer try to enable DMA for IDE devices during
+#   installation? yes or no
 hostadapters_modules=
 ide_dma=no
 
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui/ui-main

2006-03-22 Thread hawk 
Author: hawk
Date: Wed Mar 22 13:27:33 2006
New Revision: 7269

Modified:
   bootdisk/trunk/batch-installer/ui/ui-main
Log:
- oops! show all source type for bootdisk_iso


Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main   (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main   Wed Mar 22 13:27:33 2006
@@ -76,7 +76,8 @@
   if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
 echo item id=cdrom_cdrom: `nls CD-ROM device`
 echo item id=disk_disk: `nls Hard disk partition`
-  elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test 
-f /etc/bootdisk_iso; then
+  fi
+  if test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test -f 
/etc/bootdisk_iso; then
 echo item id=net_net: `nls network server (ftp, http)`
 echo item id=nfs_nfs: `nls NFS server`
   fi
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/ui/ui-wizard

2006-03-22 Thread hawk 
Author: hawk
Date: Wed Mar 22 13:28:20 2006
New Revision: 7270

Modified:
   bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- oops! show all source type for bootdisk_iso
- cosmetics


Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Wed Mar 22 13:28:20 2006
@@ -212,7 +212,8 @@
   if test -f /etc/bootdisk_cd || test -f /etc/bootdisk_iso; then
 echo item id=cdrom_cdrom: $(nls CD-ROM device)
 echo item id=disk_disk: $(nls Hard disk partition)
-  elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test -f 
/etc/bootdisk_iso; then
+  fi
+  if test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia || test -f 
/etc/bootdisk_iso; then
 echo item id=net_net: $(nls network server (ftp, http))
 echo item id=nfs_nfs: $(nls NFS server)
   fi
@@ -220,12 +221,11 @@
 /menu
 br
 $(nls Please select device you are going to install from, then press 
brEnter or Next .)
-brbr
 $(
   if test -f /etc/bootdisk_cd ; then
-echo $(nls For network based installation, please use 
bootdisk_net.imgbror boot your computer from installation CD. If you have 
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
+echo $(nls brbrFor network based installation, please use 
bootdisk_net.imgbror boot your computer from installation CD. If you have 
PCMCIAbrnetwork card, please use bootdisk_pcmcia.img.)
   elif test -f /etc/bootdisk_net || test -f /etc/bootdisk_pcmcia ; then
-echo $(nls For CD or disk based installation, please use 
bootdisk_cd.imgbror boot your computer from installation CD.)
+echo $(nls brbrFor CD or disk based installation, please use 
bootdisk_cd.imgbror boot your computer from installation CD.)
   fi
 )
 EOF
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

bootdisk/trunk/batch-installer/po/pl.po

2006-03-22 Thread hawk 
Author: hawk
Date: Wed Mar 22 13:31:33 2006
New Revision: 7271

Modified:
   bootdisk/trunk/batch-installer/po/pl.po
Log:
- updated


Modified: bootdisk/trunk/batch-installer/po/pl.po
==
--- bootdisk/trunk/batch-installer/po/pl.po (original)
+++ bootdisk/trunk/batch-installer/po/pl.po Wed Mar 22 13:31:33 2006
@@ -4,7 +4,7 @@
 msgstr 
 Project-Id-Version: PACKAGE VERSION\n
 POT-Creation-Date: 1999-07-30 18:45+0200\n
-PO-Revision-Date: 2006-03-21 23:00+0200\n
+PO-Revision-Date: 2006-03-22 13:31+0200\n
 Last-Translator: Marcin Król [EMAIL PROTECTED]\n
 Language-Team: LANGUAGE [EMAIL PROTECTED]\n
 MIME-Version: 1.0\n
@@ -1392,7 +1392,7 @@
 msgstr _Nie
 
 #: ../../batch-installer/ui/ui-functions:62
-#: ../../batch-installer/ui/ui-main:103 ../../batch-installer/ui/ui-main:281
+#: ../../batch-installer/ui/ui-main:104 ../../batch-installer/ui/ui-main:282
 msgid Information
 msgstr Informacja
 
@@ -1447,7 +1447,7 @@
 msgid Type of installation
 msgstr Typ instalacji
 
-#: ../../batch-installer/ui/ui-main:76 ../../batch-installer/ui/ui-main:140
+#: ../../batch-installer/ui/ui-main:76 ../../batch-installer/ui/ui-main:141
 #: ../../batch-installer/ui/ui-wizard:212
 #: ../../batch-installer/ui/ui-wizard:361
 msgid CD-ROM device
@@ -1457,454 +1457,454 @@
 msgid Hard disk partition
 msgstr Partycja dysku twardego
 
-#: ../../batch-installer/ui/ui-main:79 ../../batch-installer/ui/ui-wizard:215
+#: ../../batch-installer/ui/ui-main:80 ../../batch-installer/ui/ui-wizard:216
 msgid network server (ftp, http)
 msgstr serwer sieciowy (ftp, http)
 
-#: ../../batch-installer/ui/ui-main:80 ../../batch-installer/ui/ui-main:198
-#: ../../batch-installer/ui/ui-wizard:216
+#: ../../batch-installer/ui/ui-main:81 ../../batch-installer/ui/ui-main:199
+#: ../../batch-installer/ui/ui-wizard:217
 msgid NFS server
 msgstr serwer NFS
 
-#: ../../batch-installer/ui/ui-main:90 ../../batch-installer/ui/ui-wizard:355
+#: ../../batch-installer/ui/ui-main:91 ../../batch-installer/ui/ui-wizard:355
 msgid (detected)
 msgstr (wykryte)
 
-#: ../../batch-installer/ui/ui-main:106
+#: ../../batch-installer/ui/ui-main:107
 msgid hostadapters_modules must be set before selecting source devices.
 msgstr 
 hostadapters_modules musi być ustawionebrprzed wyborem urządzeń źródłowych.
 
-#: ../../batch-installer/ui/ui-main:138
+#: ../../batch-installer/ui/ui-main:139
 msgid Choose your CD-ROM device. If you have single CD drive, choose auto.
 msgstr 
 Wybierz urządzenie CD-ROM. Jeśli posiadasz pojedynczy napęd, wybierz auto.
 
-#: ../../batch-installer/ui/ui-main:144 ../../batch-installer/ui/ui-wizard:363
+#: ../../batch-installer/ui/ui-main:145 ../../batch-installer/ui/ui-wizard:363
 msgid (Primary Master)
 msgstr (Primary master)
 
-#: ../../batch-installer/ui/ui-main:145 ../../batch-installer/ui/ui-wizard:364
+#: ../../batch-installer/ui/ui-main:146 ../../batch-installer/ui/ui-wizard:364
 msgid (Primary Slave)
 msgstr (Primary Slave)
 
-#: ../../batch-installer/ui/ui-main:146 ../../batch-installer/ui/ui-wizard:365
+#: ../../batch-installer/ui/ui-main:147 ../../batch-installer/ui/ui-wizard:365
 msgid (Secondary Master)
 msgstr (Secondary Master)
 
-#: ../../batch-installer/ui/ui-main:147 ../../batch-installer/ui/ui-wizard:366
+#: ../../batch-installer/ui/ui-main:148 ../../batch-installer/ui/ui-wizard:366
 msgid (Secondary Slave)
 msgstr (Secondary Slave)
 
-#: ../../batch-installer/ui/ui-main:148 ../../batch-installer/ui/ui-wizard:367
+#: ../../batch-installer/ui/ui-main:149 ../../batch-installer/ui/ui-wizard:367
 msgid (SCSI CD-ROM #0)
 msgstr (SCSI CD-ROM #0)
 
-#: ../../batch-installer/ui/ui-main:149 ../../batch-installer/ui/ui-wizard:368
+#: ../../batch-installer/ui/ui-main:150 ../../batch-installer/ui/ui-wizard:368
 msgid (SCSI CD-ROM #1)
 msgstr (SCSI CD-ROM #1)
 
-#: ../../batch-installer/ui/ui-main:150 ../../batch-installer/ui/ui-wizard:369
+#: ../../batch-installer/ui/ui-main:151 ../../batch-installer/ui/ui-wizard:369
 msgid (SCSI CD-ROM #2)
 msgstr (SCSI CD-ROM #2)
 
-#: ../../batch-installer/ui/ui-main:151 ../../batch-installer/ui/ui-wizard:370
+#: ../../batch-installer/ui/ui-main:152 ../../batch-installer/ui/ui-wizard:370
 msgid (SCSI CD-ROM #3)
 msgstr (SCSI CD-ROM #3)
 
-#: ../../batch-installer/ui/ui-main:158
+#: ../../batch-installer/ui/ui-main:159
 msgid Choose partition or enter custom one.
 msgstr Wybierz partycję z listy lub wpisz własną
 
-#: ../../batch-installer/ui/ui-main:160
+#: ../../batch-installer/ui/ui-main:161
 msgid Disk partition with source
 msgstr Partycja dysku zawierająca źródło dystrybucji
 
-#: ../../batch-installer/ui/ui-main:196
+#: ../../batch-installer/ui/ui-main:197
 msgid NFS device should be given in form machine:/directory.
 msgstr Podaj adres NFS w postaci komputer:/katalog
 
-#: ../../batch-installer/ui/ui-main:209
+#: ../../batch-installer/ui/ui-main:210
 msgid Choose server or enter custom one.
 msgstr Wybierz serwer z listy lub

admin (AC-branch): ftp/geniso-mini - changed ${ISONAME}-iso.md5 to...

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:18:59 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- changed ${ISONAME}-iso.md5 to ${ISONAME}.md5

 Files affected:
admin/ftp:
   geniso-mini (1.20.2.3 - 1.20.2.4) 

 Diffs:


Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20.2.3 admin/ftp/geniso-mini:1.20.2.4
--- admin/ftp/geniso-mini:1.20.2.3  Sun Mar 12 22:53:33 2006
+++ admin/ftp/geniso-mini   Wed Mar 22 18:18:54 2006
@@ -135,7 +135,7 @@
  -o ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso \
  $T/
echo Generating md5sum for ${ISONAME}.iso
-   md5sum ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso  
${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}-iso.md5
+   md5sum ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso  
${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.md5
;;
   ppc )
echo Ascii   'ttxt''TEXT'   \Text file\ \
@@ -158,7 +158,7 @@
hattrib -t conf -c UNIX yaboot.conf
humount
echo Generating md5sum for ${ISONAME}.iso
-   md5sum ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso  
${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}-iso.md5
+   md5sum ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso  
${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.md5
 ;;
   * )
 echo EVIL arch: $ARCH


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20.2.3r2=1.20.2.4f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-poldek - better naming for .md5 file

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:19:43 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- better naming for .md5 file

 Files affected:
admin/ftp:
   geniso-poldek (1.15.2.21 - 1.15.2.22) 

 Diffs:


Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.21 admin/ftp/geniso-poldek:1.15.2.22
--- admin/ftp/geniso-poldek:1.15.2.21   Mon Mar 13 01:08:04 2006
+++ admin/ftp/geniso-poldek Wed Mar 22 18:19:38 2006
@@ -244,7 +244,7 @@
echo Generating ls and md5sum for ${ISONAME}.iso
cd ${ISOTARGET}/iso/${DIST}/${ARCH}
/usr/bin/isoinfo -R -l -i ${ISONAME}.iso  ${ISONAME}.ls
-   md5sum ${ISONAME}.iso  pld-${DVD}${ARCH}-iso.md5
+   md5sum ${ISONAME}.iso  pld-${DVD}${DIST}-${SUBVER}.${ARCH}.md5
 
rm -rf ${ISODIR}
 


 CVS-web:

http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.21r2=1.15.2.22f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - enhanced a bit, adjusted for Ac

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:20:40 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- enhanced a bit, adjusted for Ac

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1 - 1.1.2.1) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1 admin/ftp/geniso-SRPMS:1.1.2.1
--- admin/ftp/geniso-SRPMS:1.1  Mon Apr  8 12:15:27 2002
+++ admin/ftp/geniso-SRPMS  Wed Mar 22 18:20:35 2006
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-ROOT=/home/ftp/pub/Linux/PLD
-SRPMS=$ROOT/PLD-1.0/SRPMS
+ROOT=/pld/ftp
+VERSION=2.0
+SUBVER=RC1
+
+MKISOFS=/usr/bin/mkisofs
+
+ISOTARGET=/pld/ftp
+
+SRPMS=$ROOT/dists/$VERSION/PLD/SRPMS
+
 size=0
 fileno=1
 iso_size=`expr 1024 \* 1024 \* 650`
@@ -35,7 +43,14 @@
 calc_size ./
 for i in /tmp/cd*.links ; do
num=`echo $i | sed 's/\/tmp\/cd\([0-9]\+\)\.links/\1/'`
-   $ROOT/.stat/bin/mkisofs -o $ROOT/iso/ra/SRPMS/pld-SRPMS${num}.iso -f -r 
-J -f $i || rm -f $ROOT/iso/ra/SRPMS/pld-SRPMS${num}.iso
-   (cd $ROOT/iso/ra/SRPMS ; md5sum pld-SRPMS${num}.iso  
pld-SRPMS${num}.md5; $ROOT/.stat/bin/isoinfo -R -l -i pld-SRPMS${num}.iso  
pld-SRPMS${num}.ls)
+
+   ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS.iso
+   ${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME} \
+   -f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}
+
+   echo Generating ls and md5sum for ${ISONAME}.iso
+   cd ${ISOTARGET}/iso/${DIST}/${ARCH}
+   /usr/bin/isoinfo -R -l -i ${ISONAME}.iso  ${ISONAME}.ls
+   md5sum ${ISONAME}.iso  pld-${VERSION}-${SUBVER}.SRPMS.md5
 done
 rm -fr /tmp/cd*.links


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1r2=1.1.2.1f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - oops! small fixes :)

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:31:10 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- oops! small fixes :)

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.1 - 1.1.2.2) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.1 admin/ftp/geniso-SRPMS:1.1.2.2
--- admin/ftp/geniso-SRPMS:1.1.2.1  Wed Mar 22 18:20:35 2006
+++ admin/ftp/geniso-SRPMS  Wed Mar 22 18:31:05 2006
@@ -44,9 +44,9 @@
 for i in /tmp/cd*.links ; do
num=`echo $i | sed 's/\/tmp\/cd\([0-9]\+\)\.links/\1/'`
 
-   ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS.iso
-   ${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME} \
-   -f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}
+   ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS
+   ${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \
+   -f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso
 
echo Generating ls and md5sum for ${ISONAME}.iso
cd ${ISOTARGET}/iso/${DIST}/${ARCH}


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.1r2=1.1.2.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - use definable tmp dir

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:38:22 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- use definable tmp dir

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.2 - 1.1.2.3) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.2 admin/ftp/geniso-SRPMS:1.1.2.3
--- admin/ftp/geniso-SRPMS:1.1.2.2  Wed Mar 22 18:31:05 2006
+++ admin/ftp/geniso-SRPMS  Wed Mar 22 18:38:16 2006
@@ -8,12 +8,14 @@
 
 ISOTARGET=/pld/ftp
 
+ISOTMPDIR=$HOME/tmp
+
 SRPMS=$ROOT/dists/$VERSION/PLD/SRPMS
 
 size=0
 fileno=1
 iso_size=`expr 1024 \* 1024 \* 650`
-listd=/tmp/cd${fileno}.links
+listd=${ISOTMPDIR}/cd${fileno}.links
 
 calc_size()
 {
@@ -31,17 +33,17 @@
if [ $size -ge $iso_size ] ; then
size=0
fileno=`expr $fileno + 1`
-   listd=/tmp/cd${fileno}.links
+   listd=${ISOTMPDIR}/cd${fileno}.links
mkdir -p $listd/$dir
fi
ln -sf $SRPMS/$dir/$name $listd/$dir/$name
done
 }
 
-rm -fr /tmp/cd*.links
+rm -fr ${ISOTMPDIR}/cd*.links
 cd $SRPMS
 calc_size ./
-for i in /tmp/cd*.links ; do
+for i in ${ISOTMPDIR}/cd*.links ; do
num=`echo $i | sed 's/\/tmp\/cd\([0-9]\+\)\.links/\1/'`
 
ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS
@@ -53,4 +55,4 @@
/usr/bin/isoinfo -R -l -i ${ISONAME}.iso  ${ISONAME}.ls
md5sum ${ISONAME}.iso  pld-${VERSION}-${SUBVER}.SRPMS.md5
 done
-rm -fr /tmp/cd*.links
+rm -fr ${ISOTMPDIR}/cd*.links


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.2r2=1.1.2.3f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - fixed sed - show some progress

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 17:48:26 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- fixed sed
- show some progress

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.3 - 1.1.2.4) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.3 admin/ftp/geniso-SRPMS:1.1.2.4
--- admin/ftp/geniso-SRPMS:1.1.2.3  Wed Mar 22 18:38:16 2006
+++ admin/ftp/geniso-SRPMS  Wed Mar 22 18:48:20 2006
@@ -31,6 +31,7 @@
fsize=`expr $s + \( \( $s + 2047 \) % 2048 \)`
size=`expr $size + $fsize`
if [ $size -ge $iso_size ] ; then
+   echo -n  CD${fileno}
size=0
fileno=`expr $fileno + 1`
listd=${ISOTMPDIR}/cd${fileno}.links
@@ -42,9 +43,10 @@
 
 rm -fr ${ISOTMPDIR}/cd*.links
 cd $SRPMS
+echo -n Creating temporary symlinks...
 calc_size ./
 for i in ${ISOTMPDIR}/cd*.links ; do
-   num=`echo $i | sed 's/\/tmp\/cd\([0-9]\+\)\.links/\1/'`
+   num=`echo $i | sed 's/\/.*\/cd\([0-9]\+\)\.links/\1/'`
 
ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS
${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.3r2=1.1.2.4f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - fixed path

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 18:02:33 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- fixed path

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.4 - 1.1.2.5) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.4 admin/ftp/geniso-SRPMS:1.1.2.5
--- admin/ftp/geniso-SRPMS:1.1.2.4  Wed Mar 22 18:48:20 2006
+++ admin/ftp/geniso-SRPMS  Wed Mar 22 19:02:28 2006
@@ -53,7 +53,7 @@
-f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso
 
echo Generating ls and md5sum for ${ISONAME}.iso
-   cd ${ISOTARGET}/iso/${DIST}/${ARCH}
+   cd ${ISOTARGET}/iso/${VERSION}/SRPMS
/usr/bin/isoinfo -R -l -i ${ISONAME}.iso  ${ISONAME}.ls
md5sum ${ISONAME}.iso  pld-${VERSION}-${SUBVER}.SRPMS.md5
 done


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.4r2=1.1.2.5f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-poldek - removed set -{x, e}, added s...

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 18:31:45 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- removed set -{x,e}, added some echos
- cleanup

 Files affected:
admin/ftp:
   geniso-poldek (1.15.2.22 - 1.15.2.23) 

 Diffs:


Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.22 admin/ftp/geniso-poldek:1.15.2.23
--- admin/ftp/geniso-poldek:1.15.2.22   Wed Mar 22 18:19:38 2006
+++ admin/ftp/geniso-poldek Wed Mar 22 19:31:40 2006
@@ -1,9 +1,6 @@
 #!/bin/sh
 # geniso-poldek: Arkadiusz Miskiewicz [EMAIL PROTECTED], 2001
 
-set -x
-set -e
-
 umask 022
 ROOT=/mnt/ftpcz
 PATH=$ROOT/.stat/bin:$PATH; export PATH
@@ -98,8 +95,6 @@
fi
 }
 
-# cd $ROOT/.stat/packages  cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot up -A 
poldek-iso.priority
-
 for ARCH in ${ARCHLIST}; do
 
 UTILS_SIZE=0
@@ -121,17 +116,14 @@
;;
 esac

-echo Generating ISOs for ${ARCH}, size ${SIZE}
+echo Generating ISOs for ${ARCH}
 
 rm -rf ${ISOTMPDIR}/pld-${ARCH}*iso*
 
-#if [ -n $POLDEK_OLD ]; then
-#  $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --mkidxz
-#else
-#  $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pndir
-#  $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pdir
-#fi
+echo Checking/updating package indexes
 $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
+
+echo Generating split files
 $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
--split-conf=./poldek-iso.priority \
@@ -142,6 +134,7 @@
 
 for NR in $(seq 1 ${COUNT}); do
 
+   echo Processing CD${NR}
ISODIR=$MAINISODIR/$NR
ISODIR0=$MAINISODIR/1
mkdir -p ${ISODIR}/PLD || exit 1
@@ -166,25 +159,20 @@
echo # priorites of packages used during generation of cd images 
${ISODIR0}/.pkgsplit.conf
cat ./poldek-iso.priority ${ISODIR0}/.pkgsplit.conf
 
-#  elif [ ${NR} = $COUNT ]; then
-#  mkdir -p ${ISODIR}/test/
-#  cp -a ${ROOT}/test/${ARCH}/ ${ISODIR}/test/${ARCH}/
-#  mkdir -p ${ISODIR}/supported/
-#  cp -a ${ROOT}/supported/${ARCH}/
${ISODIR}/supported/${ARCH}/
fi

mkdir -p ${ISODIR}/PLD/RPMS
-#  ln -s . ${ISODIR}/PLD/RPMS/RPMS
 
FSUFFIX=$((${NR} - 1))
[ -z $POLDEK_OLD ]  FSUFFIX=$(printf %02d $FSUFFIX)

+   echo Creating temporary symlinks
for file in $(cat ${ISOTMPDIR}/pld-${ARCH}.iso.list.${FSUFFIX}); do
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/${file} \
${ISODIR}/PLD/RPMS/${file}
done
 
-   # $POLDEK
+   echo Generating indexes
if ($POLDEK --version | grep -qE '0\.18\.'); then
$POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz
else
@@ -206,7 +194,6 @@
rel_info  ${ISODIR}/pld-version
echo CD${NR} ${ARCH}  ${ISODIR}/pld-version
 
-
 done
 
 for NR in $(seq 1 ${COUNT}); do
@@ -253,6 +240,3 @@
 rm -rf ${ISOTMPDIR}/pld-${ARCH}.iso*
 
 done
-
-# ./geniso-mini
-


 CVS-web:

http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.22r2=1.15.2.23f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-poldek - fixed problem with script f...

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 23:34:11 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- fixed problem with script failing after switching to next arch

 Files affected:
admin/ftp:
   geniso-poldek (1.15.2.23 - 1.15.2.24) 

 Diffs:


Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.23 admin/ftp/geniso-poldek:1.15.2.24
--- admin/ftp/geniso-poldek:1.15.2.23   Wed Mar 22 19:31:40 2006
+++ admin/ftp/geniso-poldek Thu Mar 23 00:34:06 2006
@@ -41,6 +41,9 @@
 #SUBVER=alpha-1
 SUBVER=RC1
 
+# directory with geniso-poldek and poldek-iso.priority
+#GENDIR=/home/users/pldac/admin/ftp
+GENDIR=`pwd`
 
 if [ $1 = dvd ]; then
ARCHLIST=i686 amd64 ppc
@@ -96,6 +99,8 @@
 }
 
 for ARCH in ${ARCHLIST}; do
+
+cd $GENDIR
 
 UTILS_SIZE=0
 case ${ARCH} in


 CVS-web:

http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.23r2=1.15.2.24f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-poldek - changed DVD image name ...

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 23:43:24 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- changed DVD image name
was: pld-dvd-2.0-RC1-CD1.i686.iso 
will be: pld-2.0-RC1-DVD1.i686.iso

 Files affected:
admin/ftp:
   geniso-poldek (1.15.2.24 - 1.15.2.25) 

 Diffs:


Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.24 admin/ftp/geniso-poldek:1.15.2.25
--- admin/ftp/geniso-poldek:1.15.2.24   Thu Mar 23 00:34:06 2006
+++ admin/ftp/geniso-poldek Thu Mar 23 00:43:19 2006
@@ -48,11 +48,11 @@
 if [ $1 = dvd ]; then
ARCHLIST=i686 amd64 ppc
CDROM_SIZE=4500
-   DVD=dvd-
+   MEDIA=DVD
 else
ARCHLIST=i386 i586 i686 athlon amd64 ppc
CDROM_SIZE=650
-   DVD=
+   MEDIA=CD
 fi
 
 POLDEK_OLD=
@@ -139,7 +139,7 @@
 
 for NR in $(seq 1 ${COUNT}); do
 
-   echo Processing CD${NR}
+   echo Processing ${MEDIA}${NR}
ISODIR=$MAINISODIR/$NR
ISODIR0=$MAINISODIR/1
mkdir -p ${ISODIR}/PLD || exit 1
@@ -197,14 +197,14 @@
 
pld_info  ${ISODIR}/PLD-README.txt
rel_info  ${ISODIR}/pld-version
-   echo CD${NR} ${ARCH}  ${ISODIR}/pld-version
+   echo ${MEDIA}${NR} ${ARCH}  ${ISODIR}/pld-version
 
 done
 
 for NR in $(seq 1 ${COUNT}); do
ISODIR=$MAINISODIR/$NR
 
-   ISONAME=pld-${DVD}${DIST}-${SUBVER}-CD${NR}.${ARCH}   
+   ISONAME=pld-${DIST}-${SUBVER}-${MEDIA}${NR}.${ARCH}   
if [ ${NR} = 1 ]; then
BOOTOPT=
case $ARCH in
@@ -236,7 +236,7 @@
echo Generating ls and md5sum for ${ISONAME}.iso
cd ${ISOTARGET}/iso/${DIST}/${ARCH}
/usr/bin/isoinfo -R -l -i ${ISONAME}.iso  ${ISONAME}.ls
-   md5sum ${ISONAME}.iso  pld-${DVD}${DIST}-${SUBVER}.${ARCH}.md5
+   md5sum ${ISONAME}.iso  pld-${DIST}-${SUBVER}.${ARCH}.md5
 
rm -rf ${ISODIR}
 


 CVS-web:

http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.24r2=1.15.2.25f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - support generating DVD images

2006-03-22 Thread hawk 
Author: hawk Date: Wed Mar 22 23:47:20 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- support generating DVD images

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.5 - 1.1.2.6) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.5 admin/ftp/geniso-SRPMS:1.1.2.6
--- admin/ftp/geniso-SRPMS:1.1.2.5  Wed Mar 22 19:02:28 2006
+++ admin/ftp/geniso-SRPMS  Thu Mar 23 00:47:15 2006
@@ -14,7 +14,13 @@
 
 size=0
 fileno=1
-iso_size=`expr 1024 \* 1024 \* 650`
+if [ $1 = dvd ]; then
+  iso_size=`expr 1024 \* 1024 \* 4500`
+  MEDIA=DVD
+else
+  iso_size=`expr 1024 \* 1024 \* 650`
+  MEDIA=CD
+fi
 listd=${ISOTMPDIR}/cd${fileno}.links
 
 calc_size()
@@ -31,7 +37,7 @@
fsize=`expr $s + \( \( $s + 2047 \) % 2048 \)`
size=`expr $size + $fsize`
if [ $size -ge $iso_size ] ; then
-   echo -n  CD${fileno}
+   echo -n  ${MEDIA}${fileno}
size=0
fileno=`expr $fileno + 1`
listd=${ISOTMPDIR}/cd${fileno}.links
@@ -48,7 +54,7 @@
 for i in ${ISOTMPDIR}/cd*.links ; do
num=`echo $i | sed 's/\/.*\/cd\([0-9]\+\)\.links/\1/'`
 
-   ISONAME=pld-${VERSION}-${SUBVER}-CD${num}.SRPMS
+   ISONAME=pld-${VERSION}-${SUBVER}-${MEDIA}${num}.SRPMS
${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \
-f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso
 


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.5r2=1.1.2.6f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

admin (AC-branch): ftp/geniso-SRPMS - fixed size calculating bug

2006-03-22 Thread hawk 
Author: hawk Date: Thu Mar 23 01:18:57 2006 GMT
Module: admin Tag: AC-branch
 Log message:
- fixed size calculating bug

 Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.6 - 1.1.2.7) 

 Diffs:


Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.6 admin/ftp/geniso-SRPMS:1.1.2.7
--- admin/ftp/geniso-SRPMS:1.1.2.6  Thu Mar 23 00:47:15 2006
+++ admin/ftp/geniso-SRPMS  Thu Mar 23 02:18:52 2006
@@ -38,7 +38,7 @@
size=`expr $size + $fsize`
if [ $size -ge $iso_size ] ; then
echo -n  ${MEDIA}${fileno}
-   size=0
+   size=$fsize
fileno=`expr $fileno + 1`
listd=${ISOTMPDIR}/cd${fileno}.links
mkdir -p $listd/$dir


 CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.6r2=1.1.2.7f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: pyrss.spec - release 2

2006-03-23 Thread hawk 
Author: hawk Date: Thu Mar 23 13:11:52 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 2

 Files affected:
SPECS:
   pyrss.spec (1.6 - 1.7) 

 Diffs:


Index: SPECS/pyrss.spec
diff -u SPECS/pyrss.spec:1.6 SPECS/pyrss.spec:1.7
--- SPECS/pyrss.spec:1.6Sun Mar 12 23:56:06 2006
+++ SPECS/pyrss.specThu Mar 23 14:11:47 2006
@@ -3,7 +3,7 @@
 Summary(pl):   PyRSS - dostarczanie skrótów wiadomości do Jabbera
 Name:  pyrss
 Version:   0.9.9.1
-Release:   1
+Release:   2
 License:   GPL
 Group: Applications/Communications
 Source0:   http://files.jabberstudio.org/pyrss/%{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.7  2006/03/23 13:11:47  hawk
+- release 2
+
 Revision 1.6  2006/03/12 22:56:06  glen
 - use %service, use sed in %post
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/pyrss.spec?r1=1.6r2=1.7f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: bircd-2.1.0rc1-p1.patch (NEW) - SEGV fix

2006-03-23 Thread hawk 
Author: hawk Date: Thu Mar 23 16:27:14 2006 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- SEGV fix

 Files affected:
SOURCES:
   bircd-2.1.0rc1-p1.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/bircd-2.1.0rc1-p1.patch
diff -u /dev/null SOURCES/bircd-2.1.0rc1-p1.patch:1.1
--- /dev/null   Thu Mar 23 17:27:14 2006
+++ SOURCES/bircd-2.1.0rc1-p1.patch Thu Mar 23 17:27:09 2006
@@ -0,0 +1,57 @@
+diff -ur bircd.old/src/s_misc.c bircd/src/s_misc.c
+--- bircd.old/src/s_misc.c Sun Feb 12 14:10:14 2006
 bircd/src/s_misc.c Mon Mar  6 19:12:46 2006
+@@ -403,7 +403,7 @@
+ 
+ /* Clean up invitefield */
+ while((lp=sptr-user-invited))
+-  del_invite(sptr,lp-value.chptr);
++  del_invite(sptr,((struct SInvite *)(lp-value.vp))-chptr);
+ }
+   }
+ 
+diff -ur bircd.old/src/s_serv.c bircd/src/s_serv.c
+--- bircd.old/src/s_serv.c Sun Feb 12 12:13:46 2006
 bircd/src/s_serv.c Wed Feb 15 21:04:24 2006
+@@ -144,7 +144,7 @@
+ {
+ Reg1 aClient *acptr=0;
+ char *upsrv[2];
+-char srvs[2*HOSTLEN+2];
++char srvs[2*HOSTLEN+6];
+ char *server;
+ char *comment=(parc2  parv[parc-1]) ? parv[parc-1]:cptr-name;
+ int c;
+@@ -235,7 +235,7 @@
+   return 0;
+   }
+ 
+-if(IsServer(cptr)  parc3)
++if(IsServer(cptr)  parc3  strlen(parv[2])(2*HOSTLEN+2))
+   {
+   char *p;
+ 
+diff -ur bircd.old/src/send.c bircd/src/send.c
+--- bircd.old/src/send.c   Sun Feb 12 12:15:50 2006
 bircd/src/send.c   Wed Feb 15 21:04:28 2006
+@@ -459,7 +459,7 @@
+ */
+ void sendto_serv_butone3(aClient *one,char *pattern,char *p1,char *p2,char 
**p3,char *p4,char *p5,char *p6,char *p7,char *p8)
+ {
+-static char str[2*HOSTLEN+2];
++static char str[2*HOSTLEN+6];
+ Reg1 aClient *cptr;
+ Reg2 int i;
+ 
+diff -ur bircd.old/src/version.c bircd/src/version.c
+--- bircd.old/src/version.cSun Feb 12 11:08:04 2006
 bircd/src/version.cMon Mar  6 19:14:10 2006
+@@ -19,7 +19,7 @@
+ 
+ #include struct.h
+ 
+-#define VER 2.1.0rc1
++#define VER 2.1.0rc1+p1
+ 
+ char *creation = __DATE__   __TIME__;
+ char *version = bIRCd VER;

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: bircd.spec - updated to 2.1.0rc1 + p1 patch (fixes SEGV)

2006-03-23 Thread hawk 
Author: hawk Date: Thu Mar 23 16:28:19 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 2.1.0rc1 + p1 patch (fixes SEGV)

 Files affected:
SPECS:
   bircd.spec (1.21 - 1.22) 

 Diffs:


Index: SPECS/bircd.spec
diff -u SPECS/bircd.spec:1.21 SPECS/bircd.spec:1.22
--- SPECS/bircd.spec:1.21   Fri Feb 24 16:20:04 2006
+++ SPECS/bircd.specThu Mar 23 17:28:14 2006
@@ -7,12 +7,12 @@
 Summary:   Internet Relay Chat Server
 Summary(pl):   Serwer IRC (Internet Relay Chat)
 Name:  bircd
-Version:   2.0.3rc13
+Version:   2.1.0rc1
 Release:   1
 License:   GPL
 Group: Daemons
-Source0:   ftp://ftp.benet.uu3.net/pub/ircd/%{name}-%{version}.tgz
-# Source0-md5: 6fe21df719c2a81ff462b514ffa065bf
+Source0:   ftp://ftp.benet.uu3.net/pub/irc/%{name}-%{version}.tgz
+# Source0-md5: 5e7b6b4ff8f3ed541d032c968de1
 Source1:   %{name}.init
 Source2:   %{name}.sysconfig
 Source3:   %{name}.logrotate
@@ -21,6 +21,7 @@
 Patch1:%{name}-config.patch
 Patch2:%{name}-smode.patch
 Patch3:%{name}-crypt.patch
+Patch4:%{name}-%{version}-p1.patch
 URL:   http://www.benet.uu3.net/~borg/
 BuildRequires: rpmbuild(macros) = 1.268
 Requires(post):fileutils
@@ -58,6 +59,7 @@
 %patch1 -p1
 %{?with_smode:%patch2 -p1}
 %{?with_crypt:%patch3 -p1}
+%patch4 -p1
 
 %build
 ./Config
@@ -129,6 +131,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.22  2006/03/23 16:28:14  hawk
+- updated to 2.1.0rc1 + p1 patch (fixes SEGV)
+
 Revision 1.21  2006/02/24 15:20:04  glen
 - use %service
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/bircd.spec?r1=1.21r2=1.22f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: bircd-2.1.0rc1.tgz

2006-03-23 Thread hawk 

Files fetched: 1

STORED: ftp://ftp.benet.uu3.net/pub/irc/bircd-2.1.0rc1.tgz
5e7b6b4ff8f3ed541d032c968de1  bircd-2.1.0rc1.tgz
Size: 288117 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: mrtg.spec - updated to 2.13.2

2006-03-23 Thread hawk 
Author: hawk Date: Thu Mar 23 22:42:27 2006 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 2.13.2

 Files affected:
SPECS:
   mrtg.spec (1.131 - 1.132) 

 Diffs:


Index: SPECS/mrtg.spec
diff -u SPECS/mrtg.spec:1.131 SPECS/mrtg.spec:1.132
--- SPECS/mrtg.spec:1.131   Sun Mar  5 15:42:52 2006
+++ SPECS/mrtg.spec Thu Mar 23 23:42:22 2006
@@ -12,12 +12,12 @@
 Summary(pt_BR):Ferramenta para fazer gráficos do uso da rede
 Summary(ru):   MRTG - ĐŇĎÇŇÁÍÍÁ ÉÚĎÂŇÁÖĹÎÉŃ ÇŇÁĆĆÉËĎ×, ÉÚĎÂŇÁÖÁŔÝÉČ ÔŇÁĆĆÉË ÎÁ 
ÍÎĎÖĹÓÔ×Ĺ ŇĎŐÔĹŇĎ×
 Name:  mrtg
-Version:   2.13.1
+Version:   2.13.2
 Release:   1
 License:   GPL
 Group: Applications/Networking
 Source0:   
http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
-# Source0-md5: c4733fd17fa1eab1651d08beb5eabd22
+# Source0-md5: daab44b14d608cda831b4dc481cec38a
 Source1:   %{name}.cfg
 Source2:   %{name}.init
 Source3:   %{name}.sysconfig
@@ -177,6 +177,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.132  2006/03/23 22:42:22  hawk
+- updated to 2.13.2
+
 Revision 1.131  2006/03/05 14:42:52  glen
 - use %service, adapterize, cosmetics
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/mrtg.spec?r1=1.131r2=1.132f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: mrtg-2.13.2.tar.gz

2006-03-23 Thread hawk 

Files fetched: 1

STORED: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-2.13.2.tar.gz
daab44b14d608cda831b4dc481cec38a  mrtg-2.13.2.tar.gz
Size: 1107214 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: perl-Image-ExifTool.spec (NEW) - new spec

2005-07-11 Thread hawk 
Author: hawk Date: Mon Jul 11 17:29:18 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- new spec

 Files affected:
SPECS:
   perl-Image-ExifTool.spec (NONE - 1.1)  (NEW)

 Diffs:


Index: SPECS/perl-Image-ExifTool.spec
diff -u /dev/null SPECS/perl-Image-ExifTool.spec:1.1
--- /dev/null   Mon Jul 11 19:29:18 2005
+++ SPECS/perl-Image-ExifTool.spec  Mon Jul 11 19:29:13 2005
@@ -0,0 +1,99 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without tests   # do not perform make test
+#
+%include   /usr/lib/rpm/macros.perl
+%definepdirImage
+%definepnamExifTool
+Summary:   Perl module for reading and writing image metadata
+Summary(pl):   Moduł perla do czytania i zapisywania metadanych w plikach 
graficznych
+Name:  perl-Image-ExifTool
+Version:   5.32
+Release:   0.1
+# same as perl
+License:   GPL v1+ or Artistic
+Group: Development/Languages/Perl
+Source0:   
http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz
+# Source0-md5: 3b727ff93fae5827250d033cbed3af53
+BuildRequires: libexif-devel
+BuildRequires: perl-devel = 1:5.8.0
+BuildRequires: rpm-perlprov = 4.1-13
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+ExifTool is a highly customizable Perl script for reading and writing
+meta information in images.
+
+ExifTool reads EXIF, GPS, IPTC, XMP, GeoTIFF, ICC Profile and
+Photoshop IRB meta information from JPG, JP2, TIFF, PNG, GIF, MIFF,
+CRW, THM, CR2, MRW, NEF, PEF, ORF and DNG images. ExifTool also
+extracts information from the maker notes of many digital cameras by
+various manufacturers including Canon, Casio, FujiFilm, Kodak,
+Minolta/Konica-Minolta, Nikon, Olympus/Epson, Panasonic/Leica,
+Pentax/Asahi, Ricoh, Sanyo and Sigma/Foveon.
+
+ExifTool writes EXIF, GPS, IPTC, XMP and MakerNotes meta information
+to JPEG, TIFF, GIF, CRW, THM, CR2, NEF, PEF and DNG images.
+
+See html/index.html for more details about ExifTool features.
+
+%description -l pl
+ExifTool to wysoce dostosowywalny skrypt perlowy do czytania i
+zapisywania metadanych w plikach graficznych.
+
+ExifTool potrafi odczytać metatagi EXIF, GPS, IPTC, XMP, GeoTIFF, ICC
+Profile, Photoshop IRB z plików JPG, JP2, TIFF, PNG, GIF, MIFF, CRW,
+THM, CR2, MRW, NEF, PEF, ORF, DNG. ExifTool odczytuje również
+informacje dodatkowe o zdjęciach zapisywane przez aparaty cyfrowe
+takich firm jak Canon, Casio, FujiFilm, Kodak, Minolta/Konica-Minolta,
+Nikon, Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Ricoh, Sanyo,
+Sigma/Foveon.
+
+ExifTool potrafi zapisać metatagi EXIF, GPS, IPTC, XMP wraz z
+informacjami dodatkowymi producenta do plików JPEG, TIFF, GIF, CRW,
+THM, CR2, NEF, PEF, DNG.
+
+Więcej informacji o możliwościach pakietu ExifTool znajduje się w
+pliku html/index.html.
+
+%prep
+%setup -q -n %{pdir}-%{pnam}-%{version}
+
+%build
+%{__perl} Makefile.PL \
+   INSTALLDIRS=vendor \
+   destdir=$RPM_BUILD_ROOT
+%{__make} \
+   OPTIMIZE=%{rpmcflags}
+
+%{?with_tests:%{__make} test}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+   DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc README Changes html
+%{perl_vendorlib}/File/RandomAccess.pm
+%{perl_vendorlib}/Image/ExifTool.pm
+%dir %{perl_vendorlib}/Image/ExifTool
+%{perl_vendorlib}/Image/ExifTool/*.p[l,m]
+%{_mandir}/man[1,3]/*
+
+%define date   %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team [EMAIL PROTECTED]
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1  2005/07/11 17:29:13  hawk
+- new spec
+

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: Image-ExifTool-5.32.tar.gz

2005-07-11 Thread hawk 

Files fetched: 1

STORED: http://www.cpan.org/modules/by-module/Image/Image-ExifTool-5.32.tar.gz
3b727ff93fae5827250d033cbed3af53  Image-ExifTool-5.32.tar.gz
Size: 526789 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: perl-Image-ExifTool.spec - doh, forgot to remove BR libexif...

2005-07-11 Thread hawk 
Author: hawk Date: Mon Jul 11 17:32:07 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- doh, forgot to remove BR libexif, its not needed

 Files affected:
SPECS:
   perl-Image-ExifTool.spec (1.1 - 1.2) 

 Diffs:


Index: SPECS/perl-Image-ExifTool.spec
diff -u SPECS/perl-Image-ExifTool.spec:1.1 SPECS/perl-Image-ExifTool.spec:1.2
--- SPECS/perl-Image-ExifTool.spec:1.1  Mon Jul 11 19:29:13 2005
+++ SPECS/perl-Image-ExifTool.spec  Mon Jul 11 19:32:02 2005
@@ -16,7 +16,6 @@
 Group: Development/Languages/Perl
 Source0:   
http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: 3b727ff93fae5827250d033cbed3af53
-BuildRequires: libexif-devel
 BuildRequires: perl-devel = 1:5.8.0
 BuildRequires: rpm-perlprov = 4.1-13
 BuildArch: noarch
@@ -94,6 +93,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.2  2005/07/11 17:32:02  hawk
+- doh, forgot to remove BR libexif, its not needed
+
 Revision 1.1  2005/07/11 17:29:13  hawk
 - new spec
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/perl-Image-ExifTool.spec?r1=1.1r2=1.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): clamav.spec - release 2 (1 was already built fo...

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 12:09:25 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- release 2 (1 was already built for AC)

 Files affected:
SPECS:
   clamav.spec (1.131.2.25 - 1.131.2.26) 

 Diffs:


Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.131.2.25 SPECS/clamav.spec:1.131.2.26
--- SPECS/clamav.spec:1.131.2.25Wed Jul 27 19:09:28 2005
+++ SPECS/clamav.spec   Thu Jul 28 14:09:20 2005
@@ -10,7 +10,7 @@
 Summary(pl):   Antywirusowe narzędzie dla Uniksów
 Name:  clamav
 Version:   0.86.2
-Release:   1
+Release:   2
 Epoch: 0
 License:   GPL
 Group: Applications
@@ -369,6 +369,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.131.2.26  2005/07/28 12:09:20  hawk
+- release 2 (1 was already built for AC)
+
 Revision 1.131.2.25  2005/07/27 17:09:28  undefine
 - up to 20050727
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.131.2.25r2=1.131.2.26f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: dhcp-3.0.3.tar.gz

2005-07-28 Thread hawk 

Files fetched: 1

STORED: ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.3.tar.gz
f91416a0b8ed3fd0601688cf0b7df58f  dhcp-3.0.3.tar.gz
Size: 870240 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: dhcp.spec - updated to 3.0.3 - removed gcc343-fix.patch, pr...

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 12:29:40 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 3.0.3
- removed gcc343-fix.patch, problem has been fixed in sources
- release 0.1, anyone has tested build with USE_SOCKET_FALLBACK?

 Files affected:
SPECS:
   dhcp.spec (1.105 - 1.106) 

 Diffs:


Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.105 SPECS/dhcp.spec:1.106
--- SPECS/dhcp.spec:1.105   Wed Jun  1 15:47:34 2005
+++ SPECS/dhcp.spec Thu Jul 28 14:29:35 2005
@@ -8,14 +8,14 @@
 Summary(pl):   Serwer DHCP
 Summary(pt_BR):Servidor DHCP (Protocolo de configuraçăo dinâmica de 
hosts)
 Name:  dhcp
-Version:   3.0.2
-Release:   2.1
+Version:   3.0.3
+Release:   0.1
 Epoch: 3
 Vendor:ISC
 License:   distributable
 Group: Networking/Daemons
 Source0:   ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: 04800a111521e7442749b2ce883f962b
+# Source0-md5: f91416a0b8ed3fd0601688cf0b7df58f
 Source1:   %{name}.init
 Source2:   %{name}-relay.init
 Source3:   %{name}-relay.sysconfig
@@ -24,7 +24,6 @@
 Patch0:%{name}-if_buffer_size.patch
 Patch1:%{name}-ldap.patch
 Patch2:%{name}-ldap1.patch
-Patch3:%{name}-gcc343-fix.patch
 URL:   http://www.isc.org/sw/dhcp/
 BuildRequires: groff
 %{?with_ldap:BuildRequires:openldap-devel}
@@ -129,7 +128,6 @@
 %patch0 -p1
 %{?with_ldap:%patch1 -p1}
 %{?with_ldap:%patch2 -p1}
-%patch3 -p1
 
 cd doc
 echo dhcpd complies with the following RFCs:  rfc-compliance
@@ -282,6 +280,11 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.106  2005/07/28 12:29:35  hawk
+- updated to 3.0.3
+- removed gcc343-fix.patch, problem has been fixed in sources
+- release 0.1, anyone has tested build with USE_SOCKET_FALLBACK?
+
 Revision 1.105  2005/06/01 13:47:34  jajcus
 - build with USE_SOCKET_FALLBACK. Without that dhcp-relay always uses the last 
interface detected/specified for sending messages to servers, ignoring host's 
routing table. Needs testing to see if nothing is broken.
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/dhcp.spec?r1=1.105r2=1.106f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: exim.spec - release 3 (2 went to Ra)

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 12:38:26 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 3 (2 went to Ra)

 Files affected:
SPECS:
   exim.spec (1.242 - 1.243) 

 Diffs:


Index: SPECS/exim.spec
diff -u SPECS/exim.spec:1.242 SPECS/exim.spec:1.243
--- SPECS/exim.spec:1.242   Sat Jul  2 09:08:13 2005
+++ SPECS/exim.spec Thu Jul 28 14:38:21 2005
@@ -17,7 +17,7 @@
 Summary(pt_BR):Servidor de correio eletrônico exim
 Name:  exim
 Version:   4.52
-Release:   2
+Release:   3
 Epoch: 2
 License:   GPL
 Group: Networking/Daemons
@@ -329,6 +329,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.243  2005/07/28 12:38:21  hawk
+- release 3 (2 went to Ra)
+
 Revision 1.242  2005/07/02 07:08:13  jack
 - Rel 1 is for Ra, 2 for Ac
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/exim.spec?r1=1.242r2=1.243f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: bircd-config.patch - updated for 2.0.3rc13

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 13:06:51 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 2.0.3rc13

 Files affected:
SOURCES:
   bircd-config.patch (1.1 - 1.2) 

 Diffs:


Index: SOURCES/bircd-config.patch
diff -u SOURCES/bircd-config.patch:1.1 SOURCES/bircd-config.patch:1.2
--- SOURCES/bircd-config.patch:1.1  Mon Aug  2 20:08:31 2004
+++ SOURCES/bircd-config.patch  Thu Jul 28 15:06:46 2005
@@ -1,7 +1,7 @@
 diff -ur bircd.orig/Config bircd/Config
 bircd.orig/Config  2004-05-30 11:30:52.0 +0200
-+++ bircd/Config   2004-08-02 18:42:02.274674232 +0200
-@@ -46,19 +46,19 @@
+--- bircd.orig/Config  2005-06-12 10:15:30.0 +0200
 bircd/Config   2005-07-28 14:52:04.891190416 +0200
+@@ -46,12 +46,12 @@
  DEFLIBS=none
  OSNAME=an unrecgonized operating system
  #
@@ -17,9 +17,10 @@
 +SET_UID=75
 +SET_GID=75
 +HUB=Yes
- LISTEN_SIZE=5
- MAXSENDQLENGTH=300
- BUFFERPOOL=(10 * MAXSENDQLENGTH)
+ CRYPT_OPER_PASS=
+ CRYPT_SALT1=0xefcdab89
+ CRYPT_SALT2=0x98badcfe
+@@ -61,7 +61,7 @@
  NICKNAMEHISTORYLENGTH=2000
  UNIXPORT=
  USE_POLL=
@@ -28,7 +29,7 @@
  FD_SETSIZE=
  
  #
-@@ -76,8 +76,6 @@
+@@ -79,8 +79,6 @@
n='-n'
  fi
  
@@ -37,7 +38,7 @@
  if [ $1 = -m ]; then
AUTO_CONFIG=
  fi
-@@ -895,16 +893,18 @@
+@@ -898,16 +896,18 @@
  echo #endif  $SETUP_H
  
  FOO=
@@ -62,7 +63,7 @@
  if [ -z $cc ] ; then
cc=$FOO
  fi
-@@ -915,16 +915,18 @@
+@@ -918,16 +918,18 @@
  rm -f Makefile.tmp
  
  FOO=
@@ -87,7 +88,7 @@
  if [ -z $cc ] ; then
cc=$FOO
  fi
-@@ -973,7 +975,12 @@
+@@ -976,7 +978,12 @@
  echo 
  echo Are you running as a HUB?
  echo $n [$FOO] - $c
@@ -101,7 +102,21 @@
  if [ -z $cc ] ; then
cc=$FOO
  fi
-@@ -1166,7 +1173,12 @@
+@@ -1007,7 +1014,12 @@
+ echo 
+ echo Encrypt O-Line password in ircd.conf?
+ echo $n [$FOO] - $c
+-read cc
++if [ -z $AUTO_CONFIG -o -n $runonce ] ; then
++  read cc
++else
++  cc=
++  runonce=Yes
++fi
+ if [ -z $cc ] ; then
+   cc=$FOO
+ fi
+@@ -1199,7 +1211,12 @@
  echo If you aren't sure, answer NO. select() will be used instead.
  echo Use poll() for non-blocking I/O?
  echo $n [$FOO] - $c
@@ -114,7 +129,7 @@
  if [ -z $cc ] ; then
cc=$FOO
  fi
-@@ -1194,7 +1206,12 @@
+@@ -1227,7 +1244,12 @@
  echo How many file descriptors (or sockets) can the irc server use?
  echo (This value should be the multiply of 64)
  echo $n [$FOO] - $c
@@ -128,7 +143,7 @@
  if [ -z $cc ] ; then
cc=$FOO
  fi
-@@ -1330,10 +1347,8 @@
+@@ -1363,10 +1385,8 @@
  #define NICKNAMEHISTORYLENGTH $NICKNAMEHISTORYLENGTH
  __EOF__
  
@@ -143,7 +158,7 @@
echo #define USE_POLL  $OPTIONS_H
 diff -ur bircd.orig/doc/example.conf bircd/doc/example.conf
 --- bircd.orig/doc/example.conf2004-02-21 17:45:02.0 +0100
-+++ bircd/doc/example.conf 2004-08-02 18:35:44.241144064 +0200
 bircd/doc/example.conf 2005-07-28 14:49:40.331166880 +0200
 @@ -13,13 +13,16 @@
  # I line says who is allowed to connect, this one allows everyone
  I:*10
@@ -166,8 +181,8 @@
  # P lines are the port lines these say what ports can be used
  P:*:::6667
 diff -ur bircd.orig/include/config.h bircd/include/config.h
 bircd.orig/include/config.h2004-05-30 11:31:46.0 +0200
-+++ bircd/include/config.h 2004-08-02 18:58:33.666959696 +0200
+--- bircd.orig/include/config.h2005-06-12 09:44:34.0 +0200
 bircd/include/config.h 2005-07-28 14:49:40.333166576 +0200
 @@ -37,7 +37,7 @@
  **
  ** Define this to enable IPv6 support.


 CVS-web:
http://cvs.pld-linux.org/SOURCES/bircd-config.patch?r1=1.1r2=1.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: bircd.spec - updated to 2.0.3rc13

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 13:07:20 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 2.0.3rc13

 Files affected:
SPECS:
   bircd.spec (1.19 - 1.20) 

 Diffs:


Index: SPECS/bircd.spec
diff -u SPECS/bircd.spec:1.19 SPECS/bircd.spec:1.20
--- SPECS/bircd.spec:1.19   Sat Jun 11 23:11:26 2005
+++ SPECS/bircd.specThu Jul 28 15:07:15 2005
@@ -7,12 +7,12 @@
 Summary:   Internet Relay Chat Server
 Summary(pl):   Serwer IRC (Internet Relay Chat)
 Name:  bircd
-Version:   2.0.3rc12
+Version:   2.0.3rc13
 Release:   1
 License:   GPL
 Group: Daemons
 Source0:   ftp://ftp.benet.uu3.net/pub/ircd/%{name}-%{version}.tgz
-# Source0-md5: 02d911afbe404d4b26adb73e8e0a3299
+# Source0-md5: 6fe21df719c2a81ff462b514ffa065bf
 Source1:   %{name}.init
 Source2:   %{name}.sysconfig
 Source3:   %{name}.logrotate
@@ -136,6 +136,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.20  2005/07/28 13:07:15  hawk
+- updated to 2.0.3rc13
+
 Revision 1.19  2005/06/11 21:11:26  hawk
 - updated to 2.0.3rc12
 - removed fix patch (already in sources)


 CVS-web:
http://cvs.pld-linux.org/SPECS/bircd.spec?r1=1.19r2=1.20f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: bircd-2.0.3rc13.tgz

2005-07-28 Thread hawk 

Files fetched: 1

STORED: ftp://ftp.benet.uu3.net/pub/ircd/bircd-2.0.3rc13.tgz
6fe21df719c2a81ff462b514ffa065bf  bircd-2.0.3rc13.tgz
Size: 286293 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: dhcp-gcc343-fix.patch (REMOVED) - no longer needed

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 13:16:28 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- no longer needed

 Files affected:
SOURCES:
   dhcp-gcc343-fix.patch (1.1 - NONE)  (REMOVED)

 Diffs:

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: ircd.spec - updated to 2.11.1p1

2005-07-28 Thread hawk 
Author: hawk Date: Thu Jul 28 13:27:53 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 2.11.1p1

 Files affected:
SPECS:
   ircd.spec (1.79 - 1.80) 

 Diffs:


Index: SPECS/ircd.spec
diff -u SPECS/ircd.spec:1.79 SPECS/ircd.spec:1.80
--- SPECS/ircd.spec:1.79Sat May 21 13:31:33 2005
+++ SPECS/ircd.spec Thu Jul 28 15:27:48 2005
@@ -6,12 +6,12 @@
 Summary:   Internet Relay Chat Server
 Summary(pl):   Serwer IRC (Internet Relay Chat)
 Name:  ircd
-Version:   2.11.1
+Version:   2.11.1p1
 Release:   1
 License:   GPL
 Group: Daemons
 Source0:   ftp://ftp.irc.org/irc/server/irc%{version}.tgz
-# Source0-md5: 981cff74a11a7ffacab4ce26656b3f55
+# Source0-md5: c5a2b3097a5fbeb91b39412730b02ab5
 Source1:   %{name}.init
 Source2:   %{name}.sysconfig
 Source3:   %{name}.logrotate
@@ -199,6 +199,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.80  2005/07/28 13:27:48  hawk
+- updated to 2.11.1p1
+
 Revision 1.79  2005/05/21 11:31:33  hawk
 - updated to 2.11.1
 - fixed path for .pid and .tune files (/var/lib/ircd/run - /var/lib/ircd)


 CVS-web:
http://cvs.pld-linux.org/SPECS/ircd.spec?r1=1.79r2=1.80f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: irc2.11.1p1.tgz

2005-07-28 Thread hawk 

Files fetched: 1

STORED: ftp://ftp.irc.org/irc/server/irc2.11.1p1.tgz
c5a2b3097a5fbeb91b39412730b02ab5  irc2.11.1p1.tgz
Size: 770458 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): cvs.spec - updated to 1.11.20 - release 1.1 for Ra

2005-07-30 Thread hawk 
Author: hawk Date: Sat Jul 30 20:43:55 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 1.11.20
- release 1.1 for Ra

 Files affected:
SPECS:
   cvs.spec (1.120.2.8 - 1.120.2.9) 

 Diffs:


Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.120.2.8 SPECS/cvs.spec:1.120.2.9
--- SPECS/cvs.spec:1.120.2.8Mon Mar 14 20:16:17 2005
+++ SPECS/cvs.spec  Sat Jul 30 22:43:50 2005
@@ -14,13 +14,13 @@
 Summary(uk):   óÉÓÔĹÍÁ ËĹŇŐ×ÁÎÎŃ ×ĹŇÓŚŃÍÉ
 Summary(zh_CN):˛˘ˇ˘ľÄ°ćąžšÜŔíϾͳCVS
 Name:  cvs
-Version:   1.11.19
-Release:   1
+Version:   1.11.20
+Release:   1.1
 License:   GPL
 Group: Development/Version Control
 # new feature release: 
https://www.cvshome.org/files/documents/19/610/cvs-1.12.11.tar.bz2
-Source0:   
https://www.cvshome.org/files/documents/19/742/%{name}-%{version}.tar.bz2
-# Source0-md5: ac3f9459d0bb5ed9acd6091902267594
+Source0:   
https://ccvs.cvshome.org/files/documents/19/861/%{name}-%{version}.tar.bz2
+# Source0-md5: 9e215c0ee3bb7dfb76515d7cd81a3742
 Source1:   %{name}.inetd
 # based on:
http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.2-20020513-ipv6.patch.gz
 Patch0:%{name}-ipv6.patch
@@ -298,6 +298,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.120.2.9  2005/07/30 20:43:50  hawk
+- updated to 1.11.20
+- release 1.1 for Ra
+
 Revision 1.120.2.8  2005/03/14 19:16:17  hawk
 - builds, works, release 1
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/cvs.spec?r1=1.120.2.8r2=1.120.2.9f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): zlib.spec - security update to 1.2.3 - release ...

2005-07-31 Thread hawk 
Author: hawk Date: Sun Jul 31 17:57:53 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- security update to 1.2.3
- release 2 for Ra

 Files affected:
SPECS:
   zlib.spec (1.66.2.2 - 1.66.2.3) 

 Diffs:


Index: SPECS/zlib.spec
diff -u SPECS/zlib.spec:1.66.2.2 SPECS/zlib.spec:1.66.2.3
--- SPECS/zlib.spec:1.66.2.2Tue Jan  6 02:53:29 2004
+++ SPECS/zlib.spec Sun Jul 31 19:57:48 2005
@@ -1,37 +1,36 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_asmopt  - without assmbler optimization for i[56]86
-
-%ifnarch i586 i686 athlon
-%define_asmopt 0
-%else
-%{?_without_asmopt:%define _asmopt 0}
-%{!?_without_asmopt:%define_asmopt 1}
+%bcond_without asmopt  # without assembler optimization for i586+
+%bcond_withpax
+#
+%ifnarch i586 i686 pentium3 pentium4 athlon
+%undefine  with_asmopt
+%endif
+%if %{with pax}  %{with asmopt}
+%undefine  with_asmopt
 %endif
-
 Summary:   Library for compression and decompression
 Summary(de):   Library für die Komprimierung und Dekomprimierung
 Summary(es):   Biblioteca para compresión y descompresión
-Summary(fr):   bibliothčque de compression et décompression
+Summary(fr):   Bibliothčque de compression et décompression
 Summary(pl):   Biblioteka z podprogramami do kompresji i dekompresji
 Summary(pt_BR):Biblioteca para compressăo e descompressăo
 Summary(ru):   âÉÂĚÉĎÔĹËÁ ÄĚŃ ËĎÍĐŇĹÓÓÉÉ É ÄĹËĎÍĐŇĹÓÓÉÉ
 Summary(tr):   Sýkýţtýrma iţlemleri için kitaplýk
 Summary(uk):   âŚÂĚŚĎÔĹËÁ ÄĚŃ ËĎÍĐŇĹÓŚ§ ÔÁ ÄĹËĎÍĐŇĹÓŚ§
 Name:  zlib
-Version:   1.1.4
-Release:   6
+Version:   1.2.3
+Release:   2
+Epoch: 0
 License:   BSD
 Group: Libraries
-Source0:   http://www.gzip.org/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: abc405d0bdd3ee22782d7aa20e440f08
-Patch0:%{name}-sharedlib.patch
-Patch1:%{name}-asmopt.patch
-Patch2:%{name}-gzprintf_sec.patch
-URL:   http://www.zlib.org/
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Source0:   http://www.zlib.net/%{name}-%{version}.tar.gz
+# Source0-md5: debc62758716a169df9f62e6ab2bc634
+Patch0:%{name}-asmopt.patch
+URL:   http://www.zlib.net/
 Obsoletes: zlib1
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The 'zlib' compression library provides in-memory compression and
@@ -102,7 +101,7 @@
 ÔĎĘ ÖĹ ÓÁÍÉĘ ĐĎÔĎËĎ×ÉĘ ŚÎÔĹŇĆĹĘÓ.
 
 %package devel
-Summary:   header files and libraries for zlib development
+Summary:   Header files and libraries for zlib development
 Summary(de):   Headerdateien und Libraries für zlib-Entwicklung
 Summary(es):   Bibliotecas y archivos de inclusión para desarrollo zlib
 Summary(pl):   Pliki nagłówkowe i dokumentacja do zlib
@@ -110,7 +109,7 @@
 Summary(ru):   čĹÄĹŇŮ É ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍÍÉŇĎ×ÁÎÉŃ Ó zlib
 Summary(uk):   čĹÄĹŇÉ ÔÁ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú zlib
 Group: Development/Libraries
-Requires:  %{name} = %{version}
+Requires:  %{name} = %{epoch}:%{version}-%{release}
 Obsoletes: zlib1-devel
 
 %description devel
@@ -210,7 +209,7 @@
 Summary(ru):   óÔÁÔÉŢĹÓËÁŃ ÂÉÂĚÉĎÔĹËÁ ÄĚŃ ĐŇĎÇŇÁÍÍÉŇĎ×ÁÎÉŃ Ó zlib
 Summary(uk):   óÔÁÔÉŢÎÁ ÂŚÂĚŚĎÔĹËÁ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú zlib
 Group: Development/Libraries
-Requires:  %{name}-devel = %{version}
+Requires:  %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 The 'zlib' compression library provides in-memory compression and
@@ -231,7 +230,7 @@
 strumieniu danych.
 
 Pakiet ten zawiera bibliotekę statyczną potrzebną przy tworzeniu
-wałasnych programów wykorzystujących zlib.
+własnych programów wykorzystujących zlib.
 
 %description static -l es
 Static libraries for zlib development.
@@ -249,65 +248,59 @@
 
 %prep
 %setup -q
+
+%if %{with asmopt}
 %patch0 -p1
-%{?_with_asmopt:%patch1 -p1}
 
-%if %{_asmopt}
-%patch1 -p1
-%ifarch i686 athlon
+%ifarch i686 pentium3 pentium4 athlon
 cp contrib/asm686/match.S .
 %endif
 %ifarch i586
 cp contrib/asm586/match.S .
 %endif
 %endif
-%patch2 -p1
 
 %build
-
-CFLAGS=-D_REENTRANT -fPIC %{rpmcflags}
-%if %{_asmopt}
-CFLAGS=$CFLAGS -O3 -DASMV
-%endif
-export CFLAGS
-CC=%{__cc}; export CC
+CFLAGS=-D_REENTRANT -fPIC %{rpmcflags} %{?with_asmopt:-DASMV} \
+CC=%{__cc} \
 ./configure \
--prefix=%{_prefix} \
--shared
 
 %{__make}
-
 %{__make} libz.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/lib,%{_includedir},%{_libdir},%{_mandir}/man3}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_includedir},%{_libdir},%{_mandir}/man3}
+
+%{__make} install \
+   prefix=$RPM_BUILD_ROOT%{_prefix}
+
+%if %{_libdir} != %{_prefix}/lib
+mv $RPM_BUILD_ROOT{%{_prefix}/lib/*,%{_libdir}}
+%endif
 
 install libz.a $RPM_BUILD_ROOT%{_libdir}
 install zutil.h

SPECS: zlib.spec - release 3 (2 went to Ra)

2005-07-31 Thread hawk 
Author: hawk Date: Sun Jul 31 18:03:59 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 3 (2 went to Ra)

 Files affected:
SPECS:
   zlib.spec (1.97 - 1.98) 

 Diffs:


Index: SPECS/zlib.spec
diff -u SPECS/zlib.spec:1.97 SPECS/zlib.spec:1.98
--- SPECS/zlib.spec:1.97Fri Jul 22 10:23:21 2005
+++ SPECS/zlib.spec Sun Jul 31 20:03:53 2005
@@ -21,7 +21,7 @@
 Summary(uk):   âŚÂĚŚĎÔĹËÁ ÄĚŃ ËĎÍĐŇĹÓŚ§ ÔÁ ÄĹËĎÍĐŇĹÓŚ§
 Name:  zlib
 Version:   1.2.3
-Release:   1
+Release:   3
 License:   BSD
 Group: Libraries
 Source0:   http://www.zlib.net/%{name}-%{version}.tar.gz
@@ -313,6 +313,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.98  2005/07/31 18:03:53  hawk
+- release 3 (2 went to Ra)
+
 Revision 1.97  2005/07/22 08:23:21  qboosh
 - updated to 1.2.3 (fixes CAN-2005-1849)
 - removed obsolete inftrees patch (CAN-2005-2096 fixed already in sources)


 CVS-web:
http://cvs.pld-linux.org/SPECS/zlib.spec?r1=1.97r2=1.98f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-crond.patch - fixed file mode checking (files ...

2005-08-02 Thread hawk 
Author: hawk Date: Tue Aug  2 11:07:16 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fixed file mode checking (files in /var/spool/cron were not processed)

 Files affected:
SOURCES:
   vixie-cron-crond.patch (1.9 - 1.10) 

 Diffs:


Index: SOURCES/vixie-cron-crond.patch
diff -u SOURCES/vixie-cron-crond.patch:1.9 SOURCES/vixie-cron-crond.patch:1.10
--- SOURCES/vixie-cron-crond.patch:1.9  Sat Jul 30 12:54:19 2005
+++ SOURCES/vixie-cron-crond.patch  Tue Aug  2 13:07:11 2005
@@ -102,7 +102,7 @@
goto next_crontab;
}
 -  if ((statbuf-st_mode  0) != 0600) {
-+  if ((statbuf-st_mode  0) != 0640) {
++  if ((statbuf-st_mode  07733) != 0600) {
log_it(fname, getpid(), BAD FILE MODE, tabname);
goto next_crontab;
}


 CVS-web:
http://cvs.pld-linux.org/SOURCES/vixie-cron-crond.patch?r1=1.9r2=1.10f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-pld.patch - disable syslog (we are logging to ...

2005-08-02 Thread hawk 
Author: hawk Date: Tue Aug  2 12:10:24 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- disable syslog (we are logging to /var/log/cron)

 Files affected:
SOURCES:
   vixie-cron-pld.patch (1.1 - 1.2) 

 Diffs:


Index: SOURCES/vixie-cron-pld.patch
diff -u SOURCES/vixie-cron-pld.patch:1.1 SOURCES/vixie-cron-pld.patch:1.2
--- SOURCES/vixie-cron-pld.patch:1.1Mon Jul 25 12:52:18 2005
+++ SOURCES/vixie-cron-pld.patchTue Aug  2 14:10:19 2005
@@ -139,3 +139,14 @@
  #define _PATH_CRON_PIDPIDDIR PIDFILE
  
/* 4.3BSD-style crontab */
+--- vixie-cron-4.1/config.hWed May 31 17:37:20 1995
 vixie-cron-4.1/config.hWed Feb 12 19:26:35 1997
+@@ -78,7 +78,7 @@
+* are both defined, then logging will go to both
+* places.
+*/
+-#define SYSLOG/*-*/
++/*#define SYSLOG  /*-*/
+ 
+   /* if you want cron to capitalize its name in ps
+* when running a job.  Does not work on SYSV.


 CVS-web:
http://cvs.pld-linux.org/SOURCES/vixie-cron-pld.patch?r1=1.1r2=1.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-nodebug.patch (NEW) - disable debug + compilat...

2005-08-02 Thread hawk 
Author: hawk Date: Tue Aug  2 12:12:28 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- disable debug + compilation fix when DEBUGGING = 0

 Files affected:
SOURCES:
   vixie-cron-nodebug.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/vixie-cron-nodebug.patch
diff -u /dev/null SOURCES/vixie-cron-nodebug.patch:1.1
--- /dev/null   Tue Aug  2 14:12:28 2005
+++ SOURCES/vixie-cron-nodebug.patchTue Aug  2 14:12:23 2005
@@ -0,0 +1,26 @@
+diff -u vixie.orig/config.h vixie/config.h
+--- vixie.orig/config.h2005-08-02 13:10:26.0 +0200
 vixie/config.h 2005-08-02 13:57:07.711319504 +0200
+@@ -29,7 +29,7 @@
+  */
+ 
+ #ifndef DEBUGGING
+-#define DEBUGGING 1   /* 1 or 0 -- do you want debugging code built in? */
++#define DEBUGGING 0   /* 1 or 0 -- do you want debugging code built in? */
+ #endif
+ 
+   /*
+diff -u vixie.orig/cron.c vixie/cron.c
+--- vixie.orig/cron.c  2005-08-02 13:10:26.0 +0200
 vixie/cron.c   2005-08-02 13:57:51.571651720 +0200
+@@ -49,8 +49,10 @@
+   const char **dflags;
+ 
+   fprintf(stderr, usage:  %s [-f] [-n] [-x [, ProgramName);
++#if DEBUGGING
+   for (dflags = DebugFlagNames; *dflags; dflags++)
+   fprintf(stderr, %s%s, *dflags, dflags[1] ? , : ]);
++#endif
+   fprintf(stderr, ]\n);
+   exit(ERROR_EXIT);
+ }

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-CAN-2005-1038.patch (NEW) - fix for CAN-2005-1...

2005-08-02 Thread hawk 
Author: hawk Date: Tue Aug  2 12:12:58 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fix for CAN-2005-1038, taken from Fedora

 Files affected:
SOURCES:
   vixie-cron-CAN-2005-1038.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/vixie-cron-CAN-2005-1038.patch
diff -u /dev/null SOURCES/vixie-cron-CAN-2005-1038.patch:1.1
--- /dev/null   Tue Aug  2 14:12:58 2005
+++ SOURCES/vixie-cron-CAN-2005-1038.patch  Tue Aug  2 14:12:53 2005
@@ -0,0 +1,24 @@
+--- vixie-cron-4.1/crontab.c.CAN-2005-1038 2005-04-14 18:39:04.356618000 
-0400
 vixie-cron-4.1/crontab.c   2005-04-14 18:43:50.262425000 -0400
+@@ -497,6 +497,21 @@
+   ProgramName);
+   goto remove;
+   }
++
++  if (  (!S_ISREG(statbuf.st_mode))
++  ||(S_ISLNK(statbuf.st_mode))
++  ||(S_ISDIR(statbuf.st_mode))
++||(S_ISCHR(statbuf.st_mode))
++  ||(S_ISBLK(statbuf.st_mode))
++||(S_ISFIFO(statbuf.st_mode))
++  ||(S_ISSOCK(statbuf.st_mode))
++  )
++  {
++  fprintf(stderr, %s: illegal crontab\n,
++  ProgramName);
++  goto remove;
++  }
++
+   fprintf(stderr, %s: installing new crontab\n, ProgramName);
+ fclose(NewCrontab);
+   NewCrontab=fopen(Filename,r+);

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: vixie-cron.spec - fixed file mode checking - fixed logging ...

2005-08-02 Thread hawk 
Author: hawk Date: Tue Aug  2 12:15:55 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- fixed file mode checking
- fixed logging via syslog instead of internal logging to /var/log/cron
- added fix for CAN-2005-1038, taken from Fedora
- make it compile with debugging disabled
- release 1.2, seems to work but please test

 Files affected:
SPECS:
   vixie-cron.spec (1.107 - 1.108) 

 Diffs:


Index: SPECS/vixie-cron.spec
diff -u SPECS/vixie-cron.spec:1.107 SPECS/vixie-cron.spec:1.108
--- SPECS/vixie-cron.spec:1.107 Sat Jul 30 13:16:12 2005
+++ SPECS/vixie-cron.spec   Tue Aug  2 14:15:50 2005
@@ -25,7 +25,7 @@
 Summary(zh_CN):ÓĂÓÚÔÚÔ¤ÉčĘąźäÖ´ĐĐÖ¸ś¨łĚĐňľÄ Vixie cron şǫ́łĚĐňĄŁ
 Name:  vixie-cron
 Version:   4.1
-Release:   1.1
+Release:   1.2
 License:   distributable
 Group: Daemons
 Source0:   ftp://ftp.isc.org/isc/cron/cron_%{version}.shar
@@ -50,6 +50,8 @@
 Patch10:   %{name}-selinux.patch
 Patch11:   %{name}-foreground.patch
 Patch12:   %{name}-fd0open.patch
+Patch13:   %{name}-CAN-2005-1038.patch
+Patch14:   %{name}-nodebug.patch
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: rpmbuild(macros) = 1.202
@@ -190,6 +192,8 @@
 %{?with_selinux:%patch10 -p1}
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %{__make} \
@@ -350,6 +354,13 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.108  2005/08/02 12:15:50  hawk
+- fixed file mode checking
+- fixed logging via syslog instead of internal logging to /var/log/cron
+- added fix for CAN-2005-1038, taken from Fedora
+- make it compile with debugging disabled
+- release 1.2, seems to work but please test
+
 Revision 1.107  2005/07/30 11:16:12  paszczus
 - adaptarized
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/vixie-cron.spec?r1=1.107r2=1.108f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: vixie-cron.spec - reported as working, release 3 (2 will be...

2005-08-03 Thread hawk 
Author: hawk Date: Wed Aug  3 07:21:41 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- reported as working, release 3 (2 will be for Ra)

 Files affected:
SPECS:
   vixie-cron.spec (1.108 - 1.109) 

 Diffs:


Index: SPECS/vixie-cron.spec
diff -u SPECS/vixie-cron.spec:1.108 SPECS/vixie-cron.spec:1.109
--- SPECS/vixie-cron.spec:1.108 Tue Aug  2 14:15:50 2005
+++ SPECS/vixie-cron.spec   Wed Aug  3 09:21:36 2005
@@ -25,7 +25,7 @@
 Summary(zh_CN):ÓĂÓÚÔÚÔ¤ÉčĘąźäÖ´ĐĐÖ¸ś¨łĚĐňľÄ Vixie cron şǫ́łĚĐňĄŁ
 Name:  vixie-cron
 Version:   4.1
-Release:   1.2
+Release:   3
 License:   distributable
 Group: Daemons
 Source0:   ftp://ftp.isc.org/isc/cron/cron_%{version}.shar
@@ -354,6 +354,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.109  2005/08/03 07:21:36  hawk
+- reported as working, release 3 (2 will be for Ra)
+
 Revision 1.108  2005/08/02 12:15:50  hawk
 - fixed file mode checking
 - fixed logging via syslog instead of internal logging to /var/log/cron


 CVS-web:
http://cvs.pld-linux.org/SPECS/vixie-cron.spec?r1=1.108r2=1.109f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-pld.patch - enabled syslog - changed program n...

2005-08-03 Thread hawk 
Author: hawk Date: Wed Aug  3 13:20:01 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- enabled syslog
- changed program name to crond

 Files affected:
SOURCES:
   vixie-cron-pld.patch (1.2 - 1.3) 

 Diffs:


Index: SOURCES/vixie-cron-pld.patch
diff -u SOURCES/vixie-cron-pld.patch:1.2 SOURCES/vixie-cron-pld.patch:1.3
--- SOURCES/vixie-cron-pld.patch:1.2Tue Aug  2 14:10:19 2005
+++ SOURCES/vixie-cron-pld.patchWed Aug  3 15:19:56 2005
@@ -126,7 +126,7 @@
 * be used.
 */
 -#define LOG_FILE  log
-+#define LOG_FILE  /var/log/cron
++#undef LOG_FILE
  
/* where should the daemon stick its PID?
 * PIDDIR must end in '/'.
@@ -139,14 +139,15 @@
  #define _PATH_CRON_PIDPIDDIR PIDFILE
  
/* 4.3BSD-style crontab */
 vixie-cron-4.1/config.hWed May 31 17:37:20 1995
-+++ vixie-cron-4.1/config.hWed Feb 12 19:26:35 1997
-@@ -78,7 +78,7 @@
-* are both defined, then logging will go to both
-* places.
-*/
--#define SYSLOG/*-*/
-+/*#define SYSLOG  /*-*/
+diff -uNr vixie-cron-4.1.orig/globals.h vixie-cron-4.1/globals.h
+--- vixie-cron-4.1.orig/globals.h  2005-08-03 15:03:12.699629976 +0200
 vixie-cron-4.1/globals.h   2005-08-03 15:03:58.225708960 +0200
+@@ -59,7 +59,7 @@
+ #endif
+   ;
  
-   /* if you want cron to capitalize its name in ps
-* when running a job.  Does not work on SYSV.
+-XTRN char *ProgramName INIT(amnesia);
++XTRN char *ProgramName INIT(crond);
+ XTRN int  LineNumber INIT(0);
+ XTRN time_t   StartTime INIT(0);
+ XTRN int  NoFork INIT(0);


 CVS-web:
http://cvs.pld-linux.org/SOURCES/vixie-cron-pld.patch?r1=1.2r2=1.3f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-name.patch - updated

2005-08-03 Thread hawk 
Author: hawk Date: Wed Aug  3 13:21:29 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated

 Files affected:
SOURCES:
   vixie-cron-name.patch (1.2 - 1.3) 

 Diffs:


Index: SOURCES/vixie-cron-name.patch
diff -u SOURCES/vixie-cron-name.patch:1.2 SOURCES/vixie-cron-name.patch:1.3
--- SOURCES/vixie-cron-name.patch:1.2   Mon Jul 25 12:44:27 2005
+++ SOURCES/vixie-cron-name.patch   Wed Aug  3 15:21:24 2005
@@ -15,8 +15,8 @@
 @@ -60,6 +60,7 @@
;
  
- XTRN char *ProgramName INIT(amnesia);
-+XTRN char *SyslogName INIT(amnesia);
+ XTRN char *ProgramName INIT(crond);
++XTRN char *SyslogName INIT(crond);
  XTRN int  LineNumber INIT(0);
  XTRN time_t   StartTime INIT(0);
  XTRN int  NoFork INIT(0);


 CVS-web:
http://cvs.pld-linux.org/SOURCES/vixie-cron-name.patch?r1=1.2r2=1.3f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: vixie-cron-nodebug.patch - updated

2005-08-03 Thread hawk 
Author: hawk Date: Wed Aug  3 13:23:42 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated

 Files affected:
SOURCES:
   vixie-cron-nodebug.patch (1.1 - 1.2) 

 Diffs:


Index: SOURCES/vixie-cron-nodebug.patch
diff -u SOURCES/vixie-cron-nodebug.patch:1.1 
SOURCES/vixie-cron-nodebug.patch:1.2
--- SOURCES/vixie-cron-nodebug.patch:1.1Tue Aug  2 14:12:23 2005
+++ SOURCES/vixie-cron-nodebug.patchWed Aug  3 15:23:37 2005
@@ -1,6 +1,6 @@
-diff -u vixie.orig/config.h vixie/config.h
 vixie.orig/config.h2005-08-02 13:10:26.0 +0200
-+++ vixie/config.h 2005-08-02 13:57:07.711319504 +0200
+diff -ur vixie.orig/config.h vixie/config.h
+--- vixie.orig/config.h2005-08-03 14:22:29.0 +0200
 vixie/config.h 2005-08-03 14:41:00.745117840 +0200
 @@ -29,7 +29,7 @@
   */
  
@@ -10,17 +10,23 @@
  #endif
  
/*
-diff -u vixie.orig/cron.c vixie/cron.c
 vixie.orig/cron.c  2005-08-02 13:10:26.0 +0200
-+++ vixie/cron.c   2005-08-02 13:57:51.571651720 +0200
-@@ -49,8 +49,10 @@
+diff -ur vixie.orig/cron.c vixie/cron.c
+--- vixie.orig/cron.c  2005-08-03 14:22:29.0 +0200
 vixie/cron.c   2005-08-03 14:42:01.843829424 +0200
+@@ -48,10 +48,13 @@
+ usage(void) {
const char **dflags;
  
-   fprintf(stderr, usage:  %s [-f] [-n] [-x [, ProgramName);
+-  fprintf(stderr, usage:  %s [-f] [-n] [-x [, ProgramName);
++  fprintf(stderr, usage:  %s [-f] [-n], ProgramName);
 +#if DEBUGGING
++  fprintf(stderr,  [-x [);
for (dflags = DebugFlagNames; *dflags; dflags++)
-   fprintf(stderr, %s%s, *dflags, dflags[1] ? , : ]);
+-  fprintf(stderr, %s%s, *dflags, dflags[1] ? , : ]);
+-  fprintf(stderr, ]\n);
++  fprintf(stderr, %s%s, *dflags, dflags[1] ? , : ]]);
 +#endif
-   fprintf(stderr, ]\n);
++  fprintf(stderr, \n);
exit(ERROR_EXIT);
  }
+ 


 CVS-web:
http://cvs.pld-linux.org/SOURCES/vixie-cron-nodebug.patch?r1=1.1r2=1.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): libol.spec - updated to 0.3.16

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 08:22:48 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 0.3.16

 Files affected:
SPECS:
   libol.spec (1.37.2.1 - 1.37.2.2) 

 Diffs:


Index: SPECS/libol.spec
diff -u SPECS/libol.spec:1.37.2.1 SPECS/libol.spec:1.37.2.2
--- SPECS/libol.spec:1.37.2.1   Wed Apr 13 14:51:42 2005
+++ SPECS/libol.specThu Aug  4 10:22:43 2005
@@ -2,12 +2,12 @@
 Summary:   libol library
 Summary(pl):   Biblioteka libol
 Name:  libol
-Version:   0.3.15
-Release:   2
+Version:   0.3.16
+Release:   1
 License:   GPL
 Group: Libraries
 Source0:   
http://www.balabit.hu/downloads/syslog-ng/libol/0.3/%{name}-%{version}.tar.gz
-# Source0-md5: 1c8d6a9c72a9200738a04d68e5a7b439
+# Source0-md5: 1f29be3f4bcddb5b2f3d965e78f04006
 Patch0:%{name}-autoconf.patch
 BuildRequires: autoconf = 2.53
 BuildRequires: automake
@@ -114,6 +114,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.37.2.2  2005/08/04 08:22:43  hawk
+- updated to 0.3.16
+
 Revision 1.37.2.1  2005/04/13 12:51:42  hawk
 - merged version 0.3.15 from HEAD
 - release 2 for Ra


 CVS-web:
http://cvs.pld-linux.org/SPECS/libol.spec?r1=1.37.2.1r2=1.37.2.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: libol.spec - release 2 (1 for Ra)

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 08:24:08 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 2 (1 for Ra)

 Files affected:
SPECS:
   libol.spec (1.48 - 1.49) 

 Diffs:


Index: SPECS/libol.spec
diff -u SPECS/libol.spec:1.48 SPECS/libol.spec:1.49
--- SPECS/libol.spec:1.48   Thu May 12 08:29:20 2005
+++ SPECS/libol.specThu Aug  4 10:24:03 2005
@@ -3,7 +3,7 @@
 Summary(pl):   Biblioteka libol
 Name:  libol
 Version:   0.3.16
-Release:   1
+Release:   2
 License:   GPL
 Group: Libraries
 Source0:   
http://www.balabit.hu/downloads/syslog-ng/libol/0.3/%{name}-%{version}.tar.gz
@@ -115,6 +115,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.49  2005/08/04 08:24:03  hawk
+- release 2 (1 for Ra)
+
 Revision 1.48  2005/05/12 06:29:20  qboosh
 - updated to 0.3.16
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/libol.spec?r1=1.48r2=1.49f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: syslog-ng.spec - release should be 2 (1 is for Ra)

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 08:25:12 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release should be 2 (1 is for Ra)

 Files affected:
SPECS:
   syslog-ng.spec (1.104 - 1.105) 

 Diffs:


Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.104 SPECS/syslog-ng.spec:1.105
--- SPECS/syslog-ng.spec:1.104  Thu May 26 19:15:34 2005
+++ SPECS/syslog-ng.specThu Aug  4 10:25:07 2005
@@ -7,7 +7,7 @@
 Summary(pt_BR):Daemon de log nova geraçăo
 Name:  syslog-ng
 Version:   %{mainver}.%{minorver}
-Release:   3
+Release:   2
 License:   GPL
 Group: Daemons
 Source0:   
http://www.balabit.hu/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
@@ -130,6 +130,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.105  2005/08/04 08:25:07  hawk
+- release should be 2 (1 is for Ra)
+
 Revision 1.104  2005/05/26 17:15:34  areq
 - 1.6.8
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/syslog-ng.spec?r1=1.104r2=1.105f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch_general): syslog-ng.spec - updated to 1.6.8

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 08:28:41 2005 GMT
Module: SPECS Tag: RA-branch_general
 Log message:
- updated to 1.6.8

 Files affected:
SPECS:
   syslog-ng.spec (1.102.2.1 - 1.102.2.2) 

 Diffs:


Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.102.2.1 SPECS/syslog-ng.spec:1.102.2.2
--- SPECS/syslog-ng.spec:1.102.2.1  Wed Apr 13 15:03:06 2005
+++ SPECS/syslog-ng.specThu Aug  4 10:28:36 2005
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
 %definemainver 1.6
-%defineminorver7
+%defineminorver8
 
 Summary:   Syslog-ng - new generation of the system logger
 Summary(pl):   Syslog-ng - zamiennik syskloga
 Summary(pt_BR):Daemon de log nova geraçăo
 Name:  syslog-ng
 Version:   %{mainver}.%{minorver}
-Release:   2
+Release:   1
 License:   GPL
 Group: Daemons
 Source0:   
http://www.balabit.hu/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
-# Source0-md5: dc4d7cdbc5792e7ba0fd836bbdd4c62d
+# Source0-md5: ffbad7e8e6dcbe385820b8ffba23b622
 Source1:   %{name}.init
 Source2:   %{name}.conf
 Source3:   %{name}.logrotate
@@ -20,7 +20,7 @@
 BuildRequires: autoconf = 2.53
 BuildRequires: automake
 BuildRequires: flex
-BuildRequires: libol-static = 0.3.15
+BuildRequires: libol-static = 0.3.16
 BuildRequires: libwrap-devel
 PreReq:rc-scripts = 0.2.0
 Requires(post,preun):  /sbin/chkconfig
@@ -130,6 +130,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.102.2.2  2005/08/04 08:28:36  hawk
+- updated to 1.6.8
+
 Revision 1.102.2.1  2005/04/13 13:03:06  hawk
 - version 1.6.7, release 2 for Ra
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/syslog-ng.spec?r1=1.102.2.1r2=1.102.2.2f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: imap-sharedlib.patch - updated for 2004e

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 10:42:38 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 2004e

 Files affected:
SOURCES:
   imap-sharedlib.patch (1.7 - 1.8) 

 Diffs:


Index: SOURCES/imap-sharedlib.patch
diff -u SOURCES/imap-sharedlib.patch:1.7 SOURCES/imap-sharedlib.patch:1.8
--- SOURCES/imap-sharedlib.patch:1.7Wed May  4 19:15:14 2005
+++ SOURCES/imap-sharedlib.patchThu Aug  4 12:42:32 2005
@@ -6,7 +6,7 @@
  #  (see lnp, sl4, sl5, and slx)
  # lnp Linux with Pluggable Authentication Modules (PAM)
 +# lnpsLinux with Pluggable Authentication Modules (PAM) (with shared 
libc-client)
- # lmd Mankdrake Linux
+ # lmd Mandrake Linux
  # lrh RedHat Linux 7.2 and later
  # lsu SuSE Linux
 @@ -285,7 +286,7 @@
@@ -476,7 +476,7 @@
 CRXTYPE=nfs \
 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
 +   BASELDFLAGS=../c-client/c-client.a \
-BASECFLAGS=-g -O
+BASECFLAGS=-g -O -Wno-pointer-sign
  
  ptx:  # PTX
 @@ -545,12 +578,13 @@


 CVS-web:
http://cvs.pld-linux.org/SOURCES/imap-sharedlib.patch?r1=1.7r2=1.8f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: imap.spec - updated to 2004e - release 2 (1 will be for Ra)

2005-08-04 Thread hawk 
Author: hawk Date: Thu Aug  4 10:43:27 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to 2004e
- release 2 (1 will be for Ra)

 Files affected:
SPECS:
   imap.spec (1.89 - 1.90) 

 Diffs:


Index: SPECS/imap.spec
diff -u SPECS/imap.spec:1.89 SPECS/imap.spec:1.90
--- SPECS/imap.spec:1.89Thu May 12 15:28:58 2005
+++ SPECS/imap.spec Thu Aug  4 12:43:21 2005
@@ -7,13 +7,13 @@
 Summary(uk):   úÁÂĹÚĐĹŢŐ¤ ĐŚÄÔŇÉÍËŐ ÍĹŇĹÖĹ×ĎÇĎ ĐĎŰÔĎ×ĎÇĎ ĐŇĎÔĎËĎĚŐ IMAP
 Summary(zh_CN):IMAPşÍPOPˇţÎńĆ÷
 Name:  imap
-Version:   2004d
-Release:   3
+Version:   2004e
+Release:   2
 Epoch: 1
 License:   BSD
 Group: Networking/Daemons
 Source0:   ftp://ftp.cac.washington.edu/mail/%{name}-%{version}.tar.Z
-# Source0-md5: 9bee45a210138d4a924ab95539f5ef35
+# Source0-md5: deee044b2dcaf6fe12dc545673906ac5
 Source1:   %{name}.pamd
 Source2:   %{name}-%{name}d.inetd
 Source3:   %{name}-pop2d.inetd
@@ -451,6 +451,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.90  2005/08/04 10:43:21  hawk
+- updated to 2004e
+- release 2 (1 will be for Ra)
+
 Revision 1.89  2005/05/12 13:28:58  baggins
 - release 3
 - req pam 0.79


 CVS-web:
http://cvs.pld-linux.org/SPECS/imap.spec?r1=1.89r2=1.90f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: imap-2004e.tar.Z

2005-08-04 Thread hawk 

Files fetched: 1

STORED: ftp://ftp.cac.washington.edu/mail/imap-2004e.tar.Z
deee044b2dcaf6fe12dc545673906ac5  imap-2004e.tar.Z
Size: 2219840 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): imap.spec - updated to 2004e

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 11:19:17 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 2004e

 Files affected:
SPECS:
   imap.spec (1.61.2.7 - 1.61.2.8) 

 Diffs:


Index: SPECS/imap.spec
diff -u SPECS/imap.spec:1.61.2.7 SPECS/imap.spec:1.61.2.8
--- SPECS/imap.spec:1.61.2.7Wed May  4 19:51:31 2005
+++ SPECS/imap.spec Fri Aug  5 13:19:12 2005
@@ -10,13 +10,13 @@
 Summary(uk):   úÁÂĹÚĐĹŢŐ¤ ĐŚÄÔŇÉÍËŐ ÍĹŇĹÖĹ×ĎÇĎ ĐĎŰÔĎ×ĎÇĎ ĐŇĎÔĎËĎĚŐ IMAP
 Summary(zh_CN):IMAPşÍPOPˇţÎńĆ÷
 Name:  imap
-Version:   2004d
+Version:   2004e
 Release:   1
 Epoch: 1
 License:   BSD
 Group: Networking/Daemons
 Source0:   ftp://ftp.cac.washington.edu/mail/%{name}-%{version}.tar.Z
-# Source0-md5: 9bee45a210138d4a924ab95539f5ef35
+# Source0-md5: deee044b2dcaf6fe12dc545673906ac5
 Source1:   %{name}.pamd
 Source2:   %{name}-%{name}d.inetd
 Source3:   %{name}-pop2d.inetd
@@ -454,6 +454,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.61.2.8  2005/08/05 11:19:12  hawk
+- updated to 2004e
+
 Revision 1.61.2.7  2005/05/04 17:51:31  hawk
 - updated to 2004d
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/imap.spec?r1=1.61.2.7r2=1.61.2.8f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES (RA-branch): php-lib.patch (NEW) - taken from php4-lib.pat...

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 14:52:48 2005 GMT
Module: SOURCES   Tag: RA-branch
 Log message:
- taken from php4-lib.patch from HEAD

 Files affected:
SOURCES:
   php-lib.patch (NONE - 1.1.2.1)  (NEW)

 Diffs:


Index: SOURCES/php-lib.patch
diff -u /dev/null SOURCES/php-lib.patch:1.1.2.1
--- /dev/null   Fri Aug  5 16:52:48 2005
+++ SOURCES/php-lib.patch   Fri Aug  5 16:52:43 2005
@@ -0,0 +1,23 @@
+diff -urN php-4.4.0.org/scripts/Makefile.frag php-4.4.0/scripts/Makefile.frag
+--- php-4.4.0.org/scripts/Makefile.frag2005-06-08 12:34:41.0 
+0200
 php-4.4.0/scripts/Makefile.frag2005-07-13 13:25:55.095198152 +0200
+@@ -4,7 +4,7 @@
+ #
+ 
+ phpincludedir = $(includedir)/php
+-phpbuilddir = $(libdir)/build
++phpbuilddir = $(libdir)/php/build
+ 
+ BUILD_FILES = \
+   scripts/phpize.m4 \
+diff -urN php-4.4.0.org/scripts/phpize.in php-4.4.0/scripts/phpize.in
+--- php-4.4.0.org/scripts/phpize.in2005-06-15 19:13:52.0 +0200
 php-4.4.0/scripts/phpize.in2005-07-13 13:26:32.475515480 +0200
+@@ -3,7 +3,7 @@
+ # Variable declaration
+ prefix='@prefix@'
+ exec_prefix=`eval echo @[EMAIL PROTECTED]
+-phpdir=`eval echo @[EMAIL PROTECTED]/build
++phpdir=`eval echo @[EMAIL PROTECTED]/php/build
+ includedir=`eval echo @[EMAIL PROTECTED]/php
+ builddir=`pwd`

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES (RA-branch): php-pgsql-fix.patch (NEW) - backport from PHP...

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 14:53:51 2005 GMT
Module: SOURCES   Tag: RA-branch
 Log message:
- backport from PHP CVS to fix compilation with PostgreSQL 7.2.x

 Files affected:
SOURCES:
   php-pgsql-fix.patch (NONE - 1.1.2.1)  (NEW)

 Diffs:


Index: SOURCES/php-pgsql-fix.patch
diff -u /dev/null SOURCES/php-pgsql-fix.patch:1.1.2.1
--- /dev/null   Fri Aug  5 16:53:51 2005
+++ SOURCES/php-pgsql-fix.patch Fri Aug  5 16:53:46 2005
@@ -0,0 +1,105 @@
+--- php-4.4.0.orig/ext/pgsql/config.m4 Fri Jul  1 11:10:14 2005
 php-4.4.0/ext/pgsql/config.m4  Fri Aug  5 15:13:53 2005
+@@ -1,56 +1,37 @@
+ dnl
+-dnl $Id$
++dnl $Id$
+ dnl
+ 
+-AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
+-])
+-
+ PHP_ARG_WITH(pgsql,for PostgreSQL support,
+ [  --with-pgsql[=DIR]  Include PostgreSQL support.  DIR is the PostgreSQL
+-  base install directory or the path to pg_config])
++  base install directory, defaults to 
/usr/local/pgsql.])
+ 
+ if test $PHP_PGSQL != no; then
+   PHP_EXPAND_PATH($PGSQL_INCLUDE, PGSQL_INCLUDE)
+ 
+-  AC_MSG_CHECKING(for pg_config)
+-  for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin 
/usr/bin ; do
+-  if test -x $i/pg_config; then
+-  PG_CONFIG=$i/pg_config
+-  break;
+-fi
+-  done
+-
+-  if test -n $PG_CONFIG; then
+-AC_MSG_RESULT([$PG_CONFIG])
+-PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+-PGSQL_LIBDIR=`$PG_CONFIG --libdir`
+-AC_DEFINE(HAVE_PG_CONFIG_H,1,[Whether to have pg_config.h])
++  if test $PHP_PGSQL = yes; then
++PGSQL_SEARCH_PATHS=/usr /usr/local /usr/local/pgsql
+   else
+-AC_MSG_RESULT(not found)
+-if test $PHP_PGSQL = yes; then
+-  PGSQL_SEARCH_PATHS=/usr /usr/local /usr/local/pgsql
+-else
+-  PGSQL_SEARCH_PATHS=$PHP_PGSQL
+-fi
++PGSQL_SEARCH_PATHS=$PHP_PGSQL
++  fi
+   
+-for i in $PGSQL_SEARCH_PATHS; do
+-  for j in include include/pgsql include/postgres include/postgresql ; 
do
+-if test -r $i/$j/libpq-fe.h; then
+-  PGSQL_INC_BASE=$i
+-  PGSQL_INCLUDE=$i/$j
+-  if test -r $i/$j/pg_config.h; then
+-AC_DEFINE(HAVE_PG_CONFIG_H,1,[Whether to have pg_config.h])
+-  fi
++  for i in $PGSQL_SEARCH_PATHS; do
++for j in include include/pgsql include/postgres include/postgresql ; do
++  if test -r $i/$j/libpq-fe.h; then
++PGSQL_INC_BASE=$i
++PGSQL_INCLUDE=$i/$j
++if test -r $i/$j/pg_config.h; then
++  AC_DEFINE(HAVE_PG_CONFIG_H,1,[Whether to have pg_config.h])
+ fi
+-  done
++  fi
++done
+ 
+-  for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres 
$PHP_LIBDIR/postgresql ; do
+-if test -f $i/$j/libpq.so || test -f $i/$j/libpq.a; then 
+-  PGSQL_LIBDIR=$i/$j
+-fi
+-  done
++for j in lib lib/pgsql lib/postgres lib/postgresql ; do
++  if test -f $i/$j/libpq.so || test -f $i/$j/libpq.a; then 
++PGSQL_LIBDIR=$i/$j
++  fi
+ done
+-  fi
++  done
+ 
+   if test -z $PGSQL_INCLUDE; then
+ AC_MSG_ERROR(Cannot find libpq-fe.h. Please specify correct PostgreSQL 
installation path)
+@@ -69,25 +50,10 @@
+   old_LDFLAGS=$LDFLAGS
+   LDFLAGS=$LDFLAGS -L$PGSQL_LIBDIR
+   AC_CHECK_LIB(pq, PQescapeString,AC_DEFINE(HAVE_PQESCAPE,1,[PostgreSQL 7.2.0 
or later]))
+-  AC_CHECK_LIB(pq, 
PQunescapeBytea,AC_DEFINE(HAVE_PQUNESCAPEBYTEA,1,[PostgreSQL 7.3.0 or later]))
+   AC_CHECK_LIB(pq, 
PQsetnonblocking,AC_DEFINE(HAVE_PQSETNONBLOCKING,1,[PostgreSQL 7.0.x or later]))
+   AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[Broken libpq 
under windows]))
+   AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[Older PostgreSQL]))
+   AC_CHECK_LIB(pq, 
PQclientEncoding,AC_DEFINE(HAVE_PQCLIENTENCODING,1,[PostgreSQL 7.0.x or later]))
+-  AC_CHECK_LIB(pq, 
PQparameterStatus,AC_DEFINE(HAVE_PQPARAMETERSTATUS,1,[PostgreSQL 7.4 or later]))
+-  AC_CHECK_LIB(pq, 
PQprotocolVersion,AC_DEFINE(HAVE_PQPROTOCOLVERSION,1,[PostgreSQL 7.4 or later]))
+-  AC_CHECK_LIB(pq, 
PQtransactionStatus,AC_DEFINE(HAVE_PGTRANSACTIONSTATUS,1,[PostgreSQL 7.4 or 
later]))
+-  AC_CHECK_LIB(pq, PQexecParams,AC_DEFINE(HAVE_PQEXECPARAMS,1,[PostgreSQL 7.4 
or later]))
+-  AC_CHECK_LIB(pq, PQprepare,AC_DEFINE(HAVE_PQPREPARE,1,[PostgreSQL 7.4 or 
later]))
+-  AC_CHECK_LIB(pq, PQexecPrepared,AC_DEFINE(HAVE_PQEXECPREPARED,1,[PostgreSQL 
7.4 or later]))
+-  AC_CHECK_LIB(pq, 
PQresultErrorField,AC_DEFINE(HAVE_PQRESULTERRORFIELD,1,[PostgreSQL 7.4 or 
later]))
+-  AC_CHECK_LIB(pq, 
PQsendQueryParams,AC_DEFINE(HAVE_PQSENDQUERYPARAMS,1,[PostgreSQL 7.4 or later]))
+-  AC_CHECK_LIB(pq, PQsendPrepare,AC_DEFINE(HAVE_PQSENDPREPARE,1,[PostgreSQL 
7.4 or later]))
+-  AC_CHECK_LIB(pq, 
PQsendQueryPrepared,AC_DEFINE(HAVE_PQSENDQUERYPREPARED,1,[PostgreSQL 7.4 or 
later]))
+-  AC_CHECK_LIB(pq, PQputCopyData,AC_DEFINE(HAVE_PQPUTCOPYDATA,1

SPECS (RA-branch_general): php.spec - updated to 4.4.0

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 14:55:38 2005 GMT
Module: SPECS Tag: RA-branch_general
 Log message:
- updated to 4.4.0

 Files affected:
SPECS:
   php.spec (1.255.2.33 - 1.255.2.34) 

 Diffs:


Index: SPECS/php.spec
diff -u SPECS/php.spec:1.255.2.33 SPECS/php.spec:1.255.2.34
--- SPECS/php.spec:1.255.2.33   Wed May 18 14:19:01 2005
+++ SPECS/php.spec  Fri Aug  5 16:55:32 2005
@@ -63,13 +63,13 @@
 Summary(ru):   PHP ÷ĹŇÓÉÉ 4 -- ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, 
×ŮĐĎĚÎŃĹÍŮĘ ÎÁ ÓĹŇ×ĹŇĹ
 Summary(uk):   PHP ÷ĹŇÓŚ§ 4 -- ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ 
ÓĹŇ×ĹŇŚ
 Name:  php
-Version:   4.3.11
-Release:   1.2
+Version:   4.4.0
+Release:   1
 Epoch: 3
 Group: Libraries
 License:   PHP
 Source0:   http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: fbc67d240812136a9842bc1f2a217b7a
+# Source0-md5: e85b606fe48198bfcd785e5a5b1c9613
 Source1:   FAQ.%{name}
 Source2:   zend.gif
 Source3:   %{name}-module-install
@@ -85,6 +85,7 @@
 Patch4:%{name}-link-libs.patch
 Patch5:%{name}-libpq_fs_h_path.patch
 Patch6:%{name}-wddx-fix.patch
+Patch7:%{name}-lib.patch
 Patch8:%{name}-hyperwave-fix.patch
 Patch9:%{name}-xslt-gcc33.patch
 Patch10:   %{name}-java-norpath.patch
@@ -111,6 +112,7 @@
 Patch31:   %{name}-gd_imagerotate_enable.patch
 Patch32:   %{name}-uint32_t.patch
 Patch33:   %{name}-va_copy.patch
+Patch34:   %{name}-pgsql-fix.patch
 Icon:  php4.gif
 URL:   http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:   Firebird-devel 
= 1.0.2.908-2}}
@@ -1526,6 +1528,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 # Not really needed?
 #%patch9 -p1
@@ -1560,6 +1563,7 @@
 %ifarch ppc
 %patch33 -p1
 %endif
+%patch34 -p1
 
 %build
 CFLAGS=%{rpmcflags} -DEAPI=1 -I%{_prefix}/X11R6/include
@@ -1641,7 +1645,7 @@
%{?with_imap:--with-imap=shared --with-imap-ssl} \

%{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \
%{?with_java:--with-java=/usr/lib/java} \
-   --with-jpeg-dir=shared,/usr \
+   --with-jpeg-dir=/usr \
%{?with_ldap:--with-ldap=shared} \
--with-mcal=shared,/usr \
--with-mcrypt=shared \
@@ -1662,7 +1666,7 @@
%{?with_pdf:--with-pdflib=shared} \
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
-   --with-png-dir=shared,/usr \
+   --with-png-dir=/usr \
%{?with_pspell:--with-pspell=shared} \
--with-readline=shared \
%{?with_recode:--with-recode=shared} \
@@ -1672,7 +1676,7 @@
%{?with_snmp:--with-snmp=shared} \
%{?with_sybase:--with-sybase-ct=shared,/usr --with-sybase=shared,/usr} \
--with-t1lib=shared \
-   --with-tiff-dir=shared,/usr \
+   --with-tiff-dir=/usr \
%{?with_odbc:--with-unixODBC=shared} \

%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
%{?with_xslt:--with-xslt-sablot=shared} \
@@ -2413,7 +2417,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/phpextdist
 %attr(755,root,root) %{_bindir}/phpize
 %attr(755,root,root) %{_bindir}/php-config
 %attr(755,root,root) %{_libdir}/libphp_common.so
@@ -2423,6 +2426,8 @@
 %ifarch amd64
 %{_ulibdir}/php/build
 %endif
+%{_mandir}/man1/php-config.1*
+%{_mandir}/man1/phpize.1*
 
 %files bcmath
 %defattr(644,root,root,755)
@@ -2798,6 +2803,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.255.2.34  2005/08/05 14:55:32  hawk
+- updated to 4.4.0
+
 Revision 1.255.2.33  2005/05/18 12:19:01  hawk
 - release 1.2 ro rebuild with new imap
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.255.2.33r2=1.255.2.34f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: phpMyAdmin.spec - release 2 (1 for Ra)

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 15:02:53 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 2 (1 for Ra)

 Files affected:
SPECS:
   phpMyAdmin.spec (1.102 - 1.103) 

 Diffs:


Index: SPECS/phpMyAdmin.spec
diff -u SPECS/phpMyAdmin.spec:1.102 SPECS/phpMyAdmin.spec:1.103
--- SPECS/phpMyAdmin.spec:1.102 Thu Jul  7 08:56:04 2005
+++ SPECS/phpMyAdmin.spec   Fri Aug  5 17:02:48 2005
@@ -7,7 +7,7 @@
 Version:   2.6.3
 %define_pl pl1
 #Release:  1
-Release:   1.%{_pl}.1
+Release:   2.%{_pl}.1
 License:   GPL v2
 Group: Applications/Databases/Interfaces
 Source0:   
http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
@@ -162,6 +162,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.103  2005/08/05 15:02:48  hawk
+- release 2 (1 for Ra)
+
 Revision 1.102  2005/07/07 06:56:04  dzeus
 - up to 2.6.3-pl1
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/phpMyAdmin.spec?r1=1.102r2=1.103f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): phpMyAdmin.spec - updated to 2.6.3-pl1

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 15:04:52 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 2.6.3-pl1

 Files affected:
SPECS:
   phpMyAdmin.spec (1.77.2.7 - 1.77.2.8) 

 Diffs:


Index: SPECS/phpMyAdmin.spec
diff -u SPECS/phpMyAdmin.spec:1.77.2.7 SPECS/phpMyAdmin.spec:1.77.2.8
--- SPECS/phpMyAdmin.spec:1.77.2.7  Tue May 17 18:34:00 2005
+++ SPECS/phpMyAdmin.spec   Fri Aug  5 17:04:47 2005
@@ -3,14 +3,14 @@
 Summary(pl):   phpMyAdmin - administracja bazami MySQL przez WWW
 Name:  phpMyAdmin
 # NOTE: bump _rel with every new patchlevel
-Version:   2.6.2
+Version:   2.6.3
 %define_pl pl1
 Release:   1.%{_pl}.1
 License:   GPL v2
 Group: Applications/Databases/Interfaces
 Source0:   
http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-%{_pl}.tar.bz2
+# Source0-md5: 28f6c827e99e1c96f6852c441f7e42ef
 #Source0:  http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
-# Source0-md5: f1f9f3d84815d457e4ab9a933d62eccb
 Source1:   %{name}.conf
 Patch0:%{name}-config.patch
 URL:   http://www.phpmyadmin.net/
@@ -159,6 +159,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.77.2.8  2005/08/05 15:04:47  hawk
+- updated to 2.6.3-pl1
+
 Revision 1.77.2.7  2005/05/17 16:34:00  hawk
 - updated to 2.6.2-pl1
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/phpMyAdmin.spec?r1=1.77.2.7r2=1.77.2.8f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): dhcp.spec - updated to 3.0.3

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 16:33:16 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 3.0.3

 Files affected:
SPECS:
   dhcp.spec (1.93.2.5 - 1.93.2.6) 

 Diffs:


Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.93.2.5 SPECS/dhcp.spec:1.93.2.6
--- SPECS/dhcp.spec:1.93.2.5Tue Mar 22 22:21:19 2005
+++ SPECS/dhcp.spec Fri Aug  5 18:33:10 2005
@@ -7,14 +7,14 @@
 Summary(pl):   Serwer DHCP
 Summary(pt_BR):Servidor DHCP (Protocolo de configuraçăo dinâmica de 
hosts)
 Name:  dhcp
-Version:   3.0.2
+Version:   3.0.3
 Release:   1
 Epoch: 2
 Vendor:ISC
 License:   distributable
 Group: Networking/Daemons
 Source0:   ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: 04800a111521e7442749b2ce883f962b
+# Source0-md5: f91416a0b8ed3fd0601688cf0b7df58f
 Source1:   %{name}.init
 Source2:   %{name}-relay.init
 Source3:   %{name}-relay.sysconfig
@@ -278,6 +278,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.93.2.6  2005/08/05 16:33:10  hawk
+- updated to 3.0.3
+
 Revision 1.93.2.5  2005/03/22 21:21:19  hawk
 - updated to 3.0.2
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/dhcp.spec?r1=1.93.2.5r2=1.93.2.6f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: php.spec - release 8 (non-integer release changes should wo...

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 17:06:15 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 8 (non-integer release changes should work, same changes were
  already built in php4.spec and there were no complaints about them)

 Files affected:
SPECS:
   php.spec (1.457 - 1.458) 

 Diffs:


Index: SPECS/php.spec
diff -u SPECS/php.spec:1.457 SPECS/php.spec:1.458
--- SPECS/php.spec:1.457Sun Jul 24 23:43:05 2005
+++ SPECS/php.spec  Fri Aug  5 19:06:10 2005
@@ -78,7 +78,7 @@
 Summary(uk):   PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ 
ÓĹŇ×ĹŇŚ
 Name:  php
 Version:   5.0.4
-Release:   7.1%{?with_hardening:hardened}
+Release:   8%{?with_hardening:hardened}
 Epoch: 4
 Group: Libraries
 License:   PHP
@@ -2605,6 +2605,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.458  2005/08/05 17:06:10  hawk
+- release 8 (non-integer release changes should work, same changes were
+  already built in php4.spec and there were no complaints about them)
+
 Revision 1.457  2005/07/24 21:43:05  glen
 - fix trigger
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.457r2=1.458f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: mailsync.spec - removed amd64 fix, its already in sources -...

2005-08-05 Thread hawk 
Author: hawk Date: Fri Aug  5 17:16:32 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- removed amd64 fix, its already in sources
- release 2

 Files affected:
SPECS:
   mailsync.spec (1.14 - 1.15) 

 Diffs:


Index: SPECS/mailsync.spec
diff -u SPECS/mailsync.spec:1.14 SPECS/mailsync.spec:1.15
--- SPECS/mailsync.spec:1.14Thu May 19 01:26:34 2005
+++ SPECS/mailsync.spec Fri Aug  5 19:16:26 2005
@@ -3,7 +3,7 @@
 Summary(pl):   MailSync - synchronizacja zbioru skrzynek pocztowych
 Name:  mailsync
 Version:   5.2.1
-Release:   1
+Release:   2
 License:   GPL
 Group: Applications/Mail
 Source0:   http://dl.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
@@ -38,9 +38,6 @@
 
 %prep
 %setup -q
-%if %{_lib} == lib64
-%patch2 -p1
-%endif
 
 %build
 ./autogen.sh
@@ -73,6 +70,10 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.15  2005/08/05 17:16:26  hawk
+- removed amd64 fix, its already in sources
+- release 2
+
 Revision 1.14  2005/05/18 23:26:34  zbyniu
 - up to 5.2.1; BR: autoconf, automake
 - removed obsoleted patches


 CVS-web:
http://cvs.pld-linux.org/SPECS/mailsync.spec?r1=1.14r2=1.15f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): xfsprogs.spec - uodated to 2.6.36

2005-08-07 Thread hawk 
Author: hawk Date: Sun Aug  7 18:27:04 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- uodated to 2.6.36

 Files affected:
SPECS:
   xfsprogs.spec (1.43.2.2 - 1.43.2.3) 

 Diffs:


Index: SPECS/xfsprogs.spec
diff -u SPECS/xfsprogs.spec:1.43.2.2 SPECS/xfsprogs.spec:1.43.2.3
--- SPECS/xfsprogs.spec:1.43.2.2Thu Jun 16 12:47:42 2005
+++ SPECS/xfsprogs.spec Sun Aug  7 20:26:59 2005
@@ -6,12 +6,12 @@
 Summary:   Tools for the XFS filesystem
 Summary(pl):   Narzędzia do systemu plików XFS
 Name:  xfsprogs
-Version:   2.6.25
-Release:   1
-License:   GPL
+Version:   2.6.36
+Release:   2
+License:   LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group: Applications/System
 Source0:   
ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5: 65fbf692f348b57f21edd4813733d9ae
+# Source0-md5: 41850e643b3c0c5f1690467f3a9d187f
 Patch0:%{name}-miscfix-v2.patch
 Patch1:%{name}-install-sh.patch
 Patch2:%{name}-sharedlibs.patch
@@ -150,7 +150,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{CHANGES,CREDITS,README.*}
+%doc README doc/{CHANGES,CREDITS}
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
 %{!?with_static:%attr(755,root,root) /%{_lib}/lib*.so.*.*}
@@ -176,6 +176,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.43.2.3  2005/08/07 18:26:59  hawk
+- uodated to 2.6.36
+
 Revision 1.43.2.2  2005/06/16 10:47:42  hawk
 - merged version 2.6.25 from HEAD, adjusted for Ra
 - release 1


 CVS-web:
http://cvs.pld-linux.org/SPECS/xfsprogs.spec?r1=1.43.2.2r2=1.43.2.3f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: xfsprogs.spec - release 3 (2 for Ra)

2005-08-07 Thread hawk 
Author: hawk Date: Sun Aug  7 18:29:21 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 3 (2 for Ra)

 Files affected:
SPECS:
   xfsprogs.spec (1.67 - 1.68) 

 Diffs:


Index: SPECS/xfsprogs.spec
diff -u SPECS/xfsprogs.spec:1.67 SPECS/xfsprogs.spec:1.68
--- SPECS/xfsprogs.spec:1.67Sat Aug  6 17:51:59 2005
+++ SPECS/xfsprogs.spec Sun Aug  7 20:29:16 2005
@@ -7,7 +7,7 @@
 Summary(pl):   Narzędzia do systemu plików XFS
 Name:  xfsprogs
 Version:   2.6.36
-Release:   1
+Release:   3
 License:   LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group: Applications/System
 Source0:   
ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
@@ -176,6 +176,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.68  2005/08/07 18:29:16  hawk
+- release 3 (2 for Ra)
+
 Revision 1.67  2005/08/06 15:51:59  qboosh
 - updated to 2.6.36, removed outdated gcc4 patch
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/xfsprogs.spec?r1=1.67r2=1.68f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): vixie-cron.spec - merged version 4.1 from HEAD ...

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 08:19:07 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- merged version 4.1 from HEAD
- release 2 for Ra

 Files affected:
SPECS:
   vixie-cron.spec (1.85 - 1.85.2.1) 

 Diffs:


Index: SPECS/vixie-cron.spec
diff -u SPECS/vixie-cron.spec:1.85 SPECS/vixie-cron.spec:1.85.2.1
--- SPECS/vixie-cron.spec:1.85  Sun Sep  7 12:42:02 2003
+++ SPECS/vixie-cron.spec   Mon Aug  8 10:19:01 2005
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+#
 Summary:   The Vixie cron daemon for executing specified programs at set 
times
 Summary(cs):   Démon pro periodické spouštění zadaných programů v nastaveném 
čase
 Summary(da):   Vixie cron-dćmon for křrsel af specificerede programmer ved 
bestemte tider
@@ -9,7 +10,7 @@
 Summary(is):   Vixie cron púkinn keyrir skilgreind forrit á ákveđnum tímum
 Summary(it):   Vixie: demone di cron per eseguire programmi a orari 
prestabiliti
 Summary(ja):   ŔßÄꤾ¤ě¤żťţ´Ö¤ËĆĂÄę¤ÎĽ×ĽíĽ°ĽéĽŕ¤ňźÂšÔ¤š¤ë Vixie cron ĽÇĄźĽâĽó
-Summary(no):   Vixie cron-daemon for kjřring av spesifiserte programmer ved 
bestemte tider
+Summary(nb):   Vixie cron-daemon for kjřring av spesifiserte programmer ved 
bestemte tider
 Summary(pl):   Demon Vixie cron uruchamiający zadane programy w określonym 
czasie
 Summary(pt):   O 'daemon' cron Vixie para executar programas indicados em 
alturas definidas
 Summary(ru):   Vixie cron - ÄĹÍĎÎ, ÚÁĐŐÓËÁŔÝÉĘ ĐŇĎĂĹÓÓŮ ĐĎ ŇÁÓĐÉÓÁÎÉŔ
@@ -17,15 +18,15 @@
 Summary(sl):   Strežnik Vixie cron za izvajanje programov ob določenih časih
 Summary(sv):   Vixie-cron-demonen för att köra angivna program vid bestämda 
tider
 Summary(tr):   Vixie cron süreci, periyodik program çalýţtýrma yeteneđi
-Summary(uk):   Vixie cron  - ÄĹÍĎÎ, ÝĎ ÚÁĐŐÓËÁ¤ ĐŇĎĂĹÓÉ ÚÁ ŇĎÚËĚÁÄĎÍ
+Summary(uk):   Vixie cron - ÄĹÍĎÎ, ÝĎ ÚÁĐŐÓËÁ¤ ĐŇĎĂĹÓÉ ÚÁ ŇĎÚËĚÁÄĎÍ
 Summary(zh_CN):ÓĂÓÚÔÚÔ¤ÉčĘąźäÖ´ĐĐÖ¸ś¨łĚĐňľÄ Vixie cron şǫ́łĚĐňĄŁ
 Name:  vixie-cron
-Version:   3.0.1
-Release:   86
+Version:   4.1
+Release:   2
 License:   distributable
 Group: Daemons
-Source0:   ftp://ftp.vix.com/pub/vixie/%{name}-%{version}.tar.gz
-# Source0-md5: 105369aa4dd09090eb4add7aee98b23e
+Source0:   ftp://ftp.isc.org/isc/cron/cron_%{version}.shar
+# Source0-md5: 5e1be9dbde66295821ac7899f2e1f561
 Source1:   %{name}.init
 Source2:   cron.logrotate
 Source3:   cron.sysconfig
@@ -33,42 +34,36 @@
 Source5:   
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source5-md5: 8516dbf0641eb3035d43f18b7ca95c73
 Source6:   %{name}.pam
-Patch0:%{name}-redhat.patch
-Patch1:%{name}-security.patch
-Patch3:%{name}-badsig.patch
-Patch4:%{name}-crontab.patch
-Patch5:%{name}-sigchld.patch
-Patch6:%{name}-sprintf.patch
-Patch7:%{name}-sigchld2.patch
-Patch8:%{name}-crond.patch
-Patch9:%{name}-dst.patch
-Patch10:   %{name}-0days.patch
-Patch11:   %{name}-security2.patch
-Patch12:   %{name}-DESTDIR.patch
-Patch13:   %{name}-linux.patch
-Patch14:   %{name}-crontabloc.patch
-Patch15:   %{name}-nodot.patch
-Patch16:   %{name}-time.h.patch
-Patch17:   %{name}-newtime.patch
-Patch18:   %{name}-name.patch
-Patch19:   %{name}-security3.patch
-Patch20:   %{name}-noroot.patch
-Patch21:   %{name}-pam.patch
-Patch22:   %{name}-sgid-crontab.patch
+Patch0:%{name}-pld.patch
+Patch1:%{name}-sprintf.patch
+Patch2:%{name}-sigchld2.patch
+Patch3:%{name}-crond.patch
+Patch4:%{name}-manpages.patch
+Patch5:%{name}-name.patch
+Patch6:%{name}-security3.patch
+Patch7:%{name}-noroot.patch
+Patch8:%{name}-pam.patch
+Patch9:%{name}-sgid-crontab.patch
+Patch10:   %{name}-foreground.patch
+Patch11:   %{name}-fd0open.patch
+Patch12:   %{name}-CAN-2005-1038.patch
+Patch13:   %{name}-nodebug.patch
+Patch14:   %{name}-syslog-facility.patch
+BuildRequires: pam-devel
 PreReq:rc-scripts
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):fileutils
-Requires(postun):  /usr/sbin/groupdel
+Requires(postun):  /usr/sbin/groupdel
 Requires:  /bin/run-parts
 Requires:  psmisc = 20.1
 Provides:  crontabs = 1.7
 Provides:  crondaemon
+Provides:  group(crontab)
 Obsoletes: crontabs
 Obsoletes: crondaemon
 Obsoletes: hc-cron
-BuildRequires: pam-devel
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -176,9 +171,11 @@
 ąęן°ćąžĎŕąČŁŹVixie cron žßÓиü¸ßľÄ°˛ČŤĐԺ͚ŚÄܸüÇżľÄĹäÖĂŃĄĎ
 
 %prep
-%setup -q -a5
+%setup -T -c -q

SOURCES (RA-branch): proftpd.conf - updated for 1.2.10

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 09:22:04 2005 GMT
Module: SOURCES   Tag: RA-branch
 Log message:
- updated for 1.2.10

 Files affected:
SOURCES:
   proftpd.conf (1.6 - 1.6.2.1) 

 Diffs:


Index: SOURCES/proftpd.conf
diff -u SOURCES/proftpd.conf:1.6 SOURCES/proftpd.conf:1.6.2.1
--- SOURCES/proftpd.conf:1.6Tue Apr 23 00:47:19 2002
+++ SOURCES/proftpd.confMon Aug  8 11:21:59 2005
@@ -4,30 +4,44 @@
 # nobody and ftp for normal operation and anon.
 
 ServerName ProFTPD
+ServerIdentoff
 ServerType inetd
 DeferWelcome   off
 DefaultServer  on
 
-Global
-   # Set this to on if you are running in standalone mode!
-   UseTCPD off
-   TCPDServiceName ftp
-/Global
-
 # If you want .message files to work with browsers, you probably
 # want to uncomment the next line
 #MultilineRFC2228  on
 
+# TCPD configuration
+# TCPServiceName   ftp
+#TCPAccessFilesNone
+#TCPAccessSyslogLevels info warn
+#TCPGroupAccessFiles   None
+#TCPUserAccessFilesNone
+
 # These are the TLS related options, default values
-#TlsRsaCertFileftpd-rsa.pem
-#TlsRsaKeyFile ftpd-rsa-key.pem
-#TlsDsaCertFileftpd-dsa.pem
-#TlsDsaKeyFile ftpd-dsa-key.pem
-#TlsCrlFileftpd-crl.pem
-#TlsDhParamFileftpd-dhparam.pem
-#TlsCipherList ALL:!EXP
-# don't verify any peer certificates
-#TlsCertsOkoff
+#TLSEngine off
+#TLSProtocol   SSLv23
+#TLSCipherSuiteALL:!ADH
+#TLSRSACertificateFile None
+#TLSRSACertificateKeyFile  None
+#TLSDSACertficateFile  None
+#TLSDSACertificateKeyFile  None
+#TLSCACertificateFile  None
+#TLSCACertificatePath  None
+#TLSCARevocationFile   None
+#TLSCARevocationPath   None
+#TLSCertificateChainFile   None
+#TLSDHParamFileNone
+#TLSLogNone
+#TLSOptionsNone
+#TLSRandomSeed openssl-dir/.rnd
+#TLSRenegotiateNone
+#TLSRequired   None
+#TLSTimeoutHandshake   300
+#TLSVerifyClient   None
+#TLSVerifyDepth9
 
 # Port 21 is the standard FTP port.
 Port   21
@@ -40,7 +54,7 @@
 Group  ftp
 
 # use PAM authoritative
-AuthPAMAuthoritative   on
+AuthPAMon
 
 # Normally, we want files to be overwriteable.
 Directory /


 CVS-web:
http://cvs.pld-linux.org/SOURCES/proftpd.conf?r1=1.6r2=1.6.2.1f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): proftpd.spec - merged 1.2.10-6 from HEAD fixed ...

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 11:31:04 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- merged 1.2.10-6 from HEAD fixed typos and triggers
- release 2 for Ra (wasn't built for Ac)

 Files affected:
SPECS:
   proftpd.spec (1.136.2.8 - 1.136.2.9) 

 Diffs:


Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.136.2.8 SPECS/proftpd.spec:1.136.2.9
--- SPECS/proftpd.spec:1.136.2.8Sun Mar 28 03:44:33 2004
+++ SPECS/proftpd.spec  Mon Aug  8 13:30:58 2005
@@ -1,88 +1,95 @@
 # $Revision$, $Date$
 #
-# Conditional builds:
-# _without_pam - disable PAM support
-# _with_ldap - enable LDAP suppoer
-# _with_mysql - enable MySQL suppoer
-# _with_quota - enable quota support
-# _with_linuxprivs - enable libcap support
-# _without_ipv6 - disable IPv6 and TCPD support
-# _without_ssl - disbale TLS/SSL support
-# --without pam --with ldap --with mysql --with quota --with linuxprivs
+# Conditional build:
+%bcond_without pam # disable PAM support
+%bcond_without ipv6# disable IPv6 and TCPD support
+%bcond_without ssl # disbale TLS/SSL support
+%bcond_withldap# enable LDAP support
+%bcond_withmysql   # enable MySQL support
+%bcond_withpgsql   # enable PostgreSQL support
+%bcond_withquotafile   # enable quota file support
+%bcond_withquotaldap   # enable quota ldap support
+%bcond_withquotamysql  # enable quota mysql support
+%bcond_withquotapgsql  # enable quota pgsql support
+%bcond_withlinuxprivs  # enable libcap support
+#
 Summary:   PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es):   Servidor FTP profesional, con sintaxis de configuración 
semejante a la del apache
 Summary(pl):   PROfesionalny serwer FTP
 Summary(pt_BR):Servidor FTP profissional, com sintaxe de configuraçăo 
semelhante ŕ do apache
-Summary(zh_CN):Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷.
+Summary(zh_CN):Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:  proftpd
-Version:   1.2.5
-Release:   10
+Version:   1.2.10
+Release:   2
 Epoch: 1
-License:   GPL
+License:   GPL v2+
 Group: Daemons
-Source0:   ftp://ftp.proftpd.org/historic/v1.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 100a374dfcaa4852cb767dc6afeb4277
+Source0:   ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
+# Source0-md5: 5feb4a7348e12faefc25e34fd92efdd6
 Source1:   %{name}.conf
 Source2:   %{name}.logrotate
 Source3:   ftp.pamd
 Source4:   %{name}.inetd
 Source5:   %{name}.sysconfig
 Source6:   %{name}.init
-Source7:   %{name}-mod_tcpd.c
-Source8:   ftpusers.tar.bz2
-# Source8-md5:  76c80b6ec9f4d079a1e27316edddbe16
-Patch0:%{name}-1.2.5-v6-20020808.patch.gz
-# ftp://ftp.runestig.com/pub/proftpd-tls/
-Patch1:%{name}-1.2.2rc3+v6-tls.20010505.patch.gz
-Patch2:%{name}-umode_t.patch
-Patch3:%{name}-glibc.patch
-Patch4:%{name}-paths.patch
-Patch5:%{name}-release.patch
-Patch6:%{name}-noautopriv.patch
-Patch7:%{name}-DESTDIR.patch
-Patch8:%{name}-wtmp.patch
-Patch9:%{name}-link.patch
-Patch10:   %{name}-port-65535.patch
-# from debian
-Patch11:   %{name}-mod_sql_postgres.c.diff
+Source7:   ftpusers.tar.bz2
+# Source7-md5: 76c80b6ec9f4d079a1e27316edddbe16
+Source8:   
http://www.castaglia.org/proftpd/modules/proftpd-mod-shaper-0.5.5.tar.gz
+# Source8-md5: ca3d63ffbc6ad5b6a9063f79b36d1b55
+Patch0:%{name}-umode_t.patch
+Patch1:%{name}-glibc.patch
+Patch2:%{name}-paths.patch
+Patch3:%{name}-noautopriv.patch
+Patch4:%{name}-wtmp.patch
+Patch5:%{name}-sendfile64.patch
+Patch6:%{name}-CAN-2005-2390.patch
 URL:   http://www.proftpd.org/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libwrap-devel
-%{?_with_mysql:BuildRequires:  mysql-devel}
-%{?_with_ldap:BuildRequires:   openldap-devel}
-%{?!_without_ssl:BuildRequires:openssl-devel = 0.9.6m}
-%{?!_without_pam:BuildRequires:pam-devel}
+%{?with_mysql:BuildRequires:   mysql-devel}
+%{?with_quotamysql:BuildRequires:  mysql-devel}
+BuildRequires: ncurses-devel
+%{?with_ldap:BuildRequires:openldap-devel}
+%{?with_quotaldap:BuildRequires:   openldap-devel}
+%{?with_ssl:BuildRequires: openssl-devel = 0.9.6m}
+%{?with_pam:BuildRequires: pam-devel}
+%{?with_pgsql:BuildRequires:   postgresql-devel}
+%{?with_quotapgsql:BuildRequires:  postgresql-devel}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define_sysconfdir /etc/ftpd
 %define

SPECS: proftpd.spec - fixed triggers (how they were supposed to wo...

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 11:35:44 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- fixed triggers (how they were supposed to work if they weren't included
  in subpackages at all?)
- fixed typos in triggers

 Files affected:
SPECS:
   proftpd.spec (1.204 - 1.205) 

 Diffs:


Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.204 SPECS/proftpd.spec:1.205
--- SPECS/proftpd.spec:1.204Thu Aug  4 16:00:59 2005
+++ SPECS/proftpd.spec  Mon Aug  8 13:35:39 2005
@@ -317,8 +317,8 @@
/sbin/chkconfig --del proftpd
 fi
 
-%triggerpostun -- %{name}-inetd = 1.2.10-1
-echo Changing deprecated config uptions
+%triggerpostun inetd -- %{name}-inetd = 1.2.10-1
+echo Changing deprecated config options
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
@@ -326,8 +326,8 @@
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
 
-%triggerpostun -- %{name}-standalone = 1.2.10-1
-echo Changing deprecated config uptions
+%triggerpostun standalone -- %{name}-standalone = 1.2.10-1
+echo Changing deprecated config options
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
@@ -386,6 +386,11 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.205  2005/08/08 11:35:39  hawk
+- fixed triggers (how they were supposed to work if they weren't included
+  in subpackages at all?)
+- fixed typos in triggers
+
 Revision 1.204  2005/08/04 14:00:59  adamg
 - fixes for CAN-2005-2390 (format string vulnerabilities)
 - release 6


 CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.204r2=1.205f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): proftpd.spec - handle TLS options in triggers

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 13:51:41 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- handle TLS options in triggers

 Files affected:
SPECS:
   proftpd.spec (1.136.2.9 - 1.136.2.10) 

 Diffs:


Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.136.2.9 SPECS/proftpd.spec:1.136.2.10
--- SPECS/proftpd.spec:1.136.2.9Mon Aug  8 13:30:58 2005
+++ SPECS/proftpd.spec  Mon Aug  8 15:51:36 2005
@@ -320,6 +320,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf  /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -329,6 +337,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf  /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -384,6 +400,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.136.2.10  2005/08/08 13:51:36  hawk
+- handle TLS options in triggers
+
 Revision 1.136.2.9  2005/08/08 11:30:58  hawk
 - merged 1.2.10-6 from HEAD fixed typos and triggers
 - release 2 for Ra (wasn't built for Ac)


 CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.136.2.9r2=1.136.2.10f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: proftpd.spec - handle TLS options in triggers

2005-08-08 Thread hawk 
Author: hawk Date: Mon Aug  8 13:55:43 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- handle TLS options in triggers

 Files affected:
SPECS:
   proftpd.spec (1.205 - 1.206) 

 Diffs:


Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.205 SPECS/proftpd.spec:1.206
--- SPECS/proftpd.spec:1.205Mon Aug  8 13:35:39 2005
+++ SPECS/proftpd.spec  Mon Aug  8 15:55:38 2005
@@ -322,6 +322,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf  /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -331,6 +339,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf  /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -386,6 +402,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.206  2005/08/08 13:55:38  hawk
+- handle TLS options in triggers
+
 Revision 1.205  2005/08/08 11:35:39  hawk
 - fixed triggers (how they were supposed to work if they weren't included
   in subpackages at all?)


 CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.205r2=1.206f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES (RA-branch): pure-ftpd-ipv6-fix.patch (NEW) - fix for syst...

2005-08-09 Thread hawk 
Author: hawk Date: Tue Aug  9 08:59:39 2005 GMT
Module: SOURCES   Tag: RA-branch
 Log message:
- fix for systems w/o IPV6_V6ONLY defined where pure-ftpd was binding to
  IPv4 socket and then was trying to bind IPv6 socket which was causing
  it to die silently

 Files affected:
SOURCES:
   pure-ftpd-ipv6-fix.patch (NONE - 1.1.2.1)  (NEW)

 Diffs:


Index: SOURCES/pure-ftpd-ipv6-fix.patch
diff -u /dev/null SOURCES/pure-ftpd-ipv6-fix.patch:1.1.2.1
--- /dev/null   Tue Aug  9 10:59:39 2005
+++ SOURCES/pure-ftpd-ipv6-fix.patchTue Aug  9 10:59:34 2005
@@ -0,0 +1,147 @@
+diff -ur pure-ftpd.orig/src/ftpd.c pure-ftpd/src/ftpd.c
+--- pure-ftpd.orig/src/ftpd.c  Sat Jul 17 15:28:22 2004
 pure-ftpd/src/ftpd.c   Tue Aug  9 10:28:43 2005
+@@ -4717,6 +4717,7 @@
+ 
+ static void standalone_server(void)
+ {
++
+ int on;
+ struct addrinfo hints, *res, *res6;
+ fd_set rs;
+@@ -4727,13 +4728,22 @@
+ # endif
+ memset(hints, 0, sizeof hints);
+ hints.ai_flags = AI_PASSIVE;
+-hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_addr = NULL;
++hints.ai_family = 0;
++if(v6ready)
++  {
++  if(no_ipv4) hints.ai_family = AF_INET6;
++  if(no_ipv6) hints.ai_family = AF_INET;
++  }
++else
++  {
++  hints.ai_family = AF_INET;
++  }
++
+ on = 1;
+-if (no_ipv4 == 0 
+-getaddrinfo(standalone_ip, standalone_port, hints, res) == 0) {
+-if ((listenfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1 ||
++if (getaddrinfo(standalone_ip, standalone_port, hints, res) == 0) {
++if ((listenfd = socket(res-ai_family, res-ai_socktype, 
res-ai_protocol)) == -1 ||
+ setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR,
+(char *) on, sizeof on) != 0) {
+ cant_bind:
+@@ -4741,6 +4751,10 @@
+ logfile(LOG_ERR, MSG_STANDALONE_FAILED : [%s], strerror(errno));
+ return;
+ }
++# if defined(IPPROTO_IPV6)  defined(IPV6_V6ONLY)
++(void) setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY,
++  (char *) on, sizeof on);
++# endif
+ if (bind(listenfd, res-ai_addr, (socklen_t) res-ai_addrlen) != 0 ||
+ listen(listenfd, maxusers  0U ? 
+3U + maxusers / 8U : DEFAULT_BACKLOG) != 0) {
+@@ -4749,30 +4763,7 @@
+ freeaddrinfo(res);
+ set_cloexec_flag(listenfd); 
+ }
+-if (v6ready != 0) {
+-hints.ai_family = AF_INET6;
+-if (getaddrinfo(standalone_ip, standalone_port, hints, res6) == 0) {
+-if ((listenfd6 = socket(AF_INET6,
+-SOCK_STREAM, IPPROTO_TCP)) == -1 ||
+-setsockopt(listenfd6, SOL_SOCKET, SO_REUSEADDR,
+-   (char *) on, sizeof on) != 0) {
+-goto cant_bind;
+-}   
+-# if defined(IPPROTO_IPV6)  defined(IPV6_V6ONLY)
+-(void) setsockopt(listenfd6, IPPROTO_IPV6, IPV6_V6ONLY,
+-  (char *) on, sizeof on);
+-# endif
+-if (bind(listenfd6, res6-ai_addr,
+- (socklen_t) res6-ai_addrlen) != 0 ||
+-listen(listenfd6, maxusers  0U ? 
+-   3U + maxusers / 8U : DEFAULT_BACKLOG) != 0) {
+-goto cant_bind;
+-}
+-freeaddrinfo(res6);
+-set_cloexec_flag(listenfd6);
+-}
+-}
+-if (listenfd == -1  listenfd6 == -1) {
++if (listenfd == -1) {
+ # ifdef EADDRNOTAVAIL
+ errno = EADDRNOTAVAIL;
+ # endif
+@@ -4781,15 +4772,10 @@
+ updatepidfile();
+ setprogname(pure-ftpd (SERVER));
+ FD_ZERO(rs);
+-if (listenfd  listenfd6) {
+-max_fd = listenfd;
+-} else {
+-max_fd = listenfd6;
+-}
++max_fd = listenfd;
+ max_fd++;
+ while (stop_server == 0) {  
+ safe_fd_set(listenfd, rs);
+-safe_fd_set(listenfd6, rs);
+ if (select(max_fd, rs, NULL, NULL, NULL) = 0) {
+ if (errno != EINTR) {
+ (void) sleep(1);
+@@ -4799,9 +4785,6 @@
+ if (safe_fd_isset(listenfd, rs)) {
+ accept_client(listenfd);
+ } 
+-if (safe_fd_isset(listenfd6, rs)) {
+-accept_client(listenfd6);
+-}
+ }
+ }
+ #endif
+@@ -4828,7 +4811,6 @@
+ int option_index = 0;
+ #endif
+ int fodder;
+-int bypass_ipv6 = 0;
+ struct passwd *pw;
+ 
+ #ifdef PROBE_RANDOM_AT_RUNTIME
+@@ -4907,7 +4889,7 @@
+ break;
+ }
+ case '4': {
+-bypass_ipv6 = 1;
++no_ipv6 = 1;
+ break;
+ }
+ case '6': {
+@@ -5496,9 +5478,7 @@
+ maxusers = portmax;/* ... so we don't run out of ports */
+ }
+ }
+-if (bypass_ipv6 == 0

SPECS (RA-branch): pure-ftpd.spec - updated to 1.0.20 (merge from ...

2005-08-09 Thread hawk 
Author: hawk Date: Tue Aug  9 09:03:20 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 1.0.20 (merge from HEAD)
- added fix for ipv6 socket binding
- release 7 for Ra

 Files affected:
SPECS:
   pure-ftpd.spec (1.72.2.7 - 1.72.2.8) 

 Diffs:


Index: SPECS/pure-ftpd.spec
diff -u SPECS/pure-ftpd.spec:1.72.2.7 SPECS/pure-ftpd.spec:1.72.2.8
--- SPECS/pure-ftpd.spec:1.72.2.7   Wed Nov  3 15:57:25 2004
+++ SPECS/pure-ftpd.specTue Aug  9 11:03:15 2005
@@ -1,36 +1,57 @@
 # $Revision$, $Date$
-# 
+#
 # Conditional build:
-%bcond_withmysql   # enables MySQL auth but disables PAM auth
-%bcond_withldap# enables LDAP auth
+%bcond_withextra   # with additional, maybe useful, but 
unmaintained features
+%bcond_without ldap# disable LDAP auth
+%bcond_without longusername# with username length = 128 (default 32)
+%bcond_without mysql   # disable MySQL auth but disables PAM auth
+%bcond_without pgsql   # disable PostgreSQL support
+%bcond_without puredb  # disable pure-db support
+%bcond_without tls # disable SSL/TLS support
 #
 Summary:   Small, fast and secure FTP server
 Summary(pl):   Mały, szybki i bezpieczny serwer FTP
 Name:  pure-ftpd
-Version:   1.0.14
-Release:   2
+Version:   1.0.20
+Release:   7%{?with_extra:extra}
 Epoch: 0
-License:   GPL
+License:   BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ 
license}
 Group: Daemons
 Source0:   
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: b650c4d6f59ec0781b33876932ea2038
+# Source0-md5: e928e9e15adf6b52bfe6183fdad20144
 Source1:   %{name}.pamd
 Source2:   %{name}.init
 Source3:   ftpusers.tar.bz2
 # Source3-md5: 76c80b6ec9f4d079a1e27316edddbe16
-Patch0:%{name}-DoS.patch
+Source4:   
http://twittner.host.sk/files/pure-config/pure-config-20041201.tar.gz
+# Source4-md5: 3f2ff6b00b5c38ee11ce588ee5af6cf6
+Patch0:%{name}-config.patch
+Patch1:%{name}-path_to_ssl_cert_in_config.patch
+Patch2:%{name}-pure-pw_passwd.patch
+Patch3:%{name}-userlength.patch
+Patch4:%{name}-mysql_config.patch
+Patch5:%{name}-nosymlinks-hideuidmismatch.patch
+Patch6:%{name}-ipv6-fix.patch
 URL:   http://www.pureftpd.org/
+%{?with_extra:BuildRequires:   autoconf}
+%{?with_extra:BuildRequires:   automake}
 BuildRequires: libcap-devel
-%{?with_mysql:BuildRequires:   mysql-devel}
+%{?with_extra:BuildRequires:   libcfg+-devel = 0.6.2}
 %{?with_ldap:BuildRequires:openldap-devel}
+%{?with_mysql:BuildRequires:   mysql-devel}
+%{?with_pgsql:BuildRequires:   postgresql-devel}
+%{?with_tls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
-Prereq:rc-scripts
-Requires(post,preun):/sbin/chkconfig
+PreReq:rc-scripts
+Requires(post,preun):  /sbin/chkconfig
+Requires:  pam = 0.67
+%{!?with_extra:Requires:   perl-base}
 Provides:  ftpserver
 Obsoletes: ftpserver
 Obsoletes: anonftp
 Obsoletes: bftpd
 Obsoletes: ftpd-BSD
+Obsoletes: glftpd
 Obsoletes: heimdal-ftpd
 Obsoletes: linux-ftpd
 Obsoletes: muddleftpd
@@ -61,37 +82,60 @@
 FTP bazujący na Troll-FTPd. W przeciwieństwie do innych serwerów FTP
 nie ma znanych luk w bezpieczeństwie. Ponadto jest trywialny w
 konfiguracji i specjalnie zaprojektowany dla nowych kerneli Linuksa
-(setfsuid, sendfile, capabilibies). Możliwości to wsparcie dla PAMa,
+(setfsuid, sendfile, capabilibies). Możliwości to wsparcie dla PAM-a,
 IPv6, chroot()owanych katalogów domowych, virtualne domeny, wbudowany
 LS, system anty-warezowy, ograniczanie portów dla pasywnych
 połączeń...
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a 4
+%patch0 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%{?with_longusername:%patch3 -p1}
+%{?with_extra:%patch1 -p1}
+%{?with_extra:%patch2 -p1}
 
 %build
 %configure \
-   %{?with_mysql:CPPFLAGS=-I%{_includedir}/mysql --with-mysql} \
+   --with-boring \
--with-altlog \
-   --with-puredb \
-   %{!?with_mysql:--with-pam} \
--with-cookie \
-   --with-throttling \
-   --with-ratios \
-   --with-quotas \
+   --with-diraliases \
+   --with-extauth \
--with-ftpwho \
+   --with-language=english \
--with-largefile \
+   %{?with_ldap:--with-ldap} \
+   %{?with_mysql:CPPFLAGS=-I%{_includedir}/mysql --with-mysql} \
+   --with-pam \
+   --with-peruserlimits \
+   %{?with_pgsql:--with-pgsql} \
+   --with-privsep \
+   %{?with_puredb:--with-puredb} \
+   --with-quotas \
+   --with-ratios \
+   --with-throttling \
+   %{?with_tls:--with-tls 
--with-certfile=%{_sharedstatedir}/openssl/certs

SPECS: pure-ftpd.spec - release 8 (7 for Ra)

2005-08-09 Thread hawk 
Author: hawk Date: Tue Aug  9 09:04:18 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 8 (7 for Ra)

 Files affected:
SPECS:
   pure-ftpd.spec (1.137 - 1.138) 

 Diffs:


Index: SPECS/pure-ftpd.spec
diff -u SPECS/pure-ftpd.spec:1.137 SPECS/pure-ftpd.spec:1.138
--- SPECS/pure-ftpd.spec:1.137  Sat Jun 18 13:08:41 2005
+++ SPECS/pure-ftpd.specTue Aug  9 11:04:12 2005
@@ -13,7 +13,7 @@
 Summary(pl):   Mały, szybki i bezpieczny serwer FTP
 Name:  pure-ftpd
 Version:   1.0.20
-Release:   6%{?with_extra:extra}
+Release:   8%{?with_extra:extra}
 Epoch: 0
 License:   BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ 
license}
 Group: Daemons
@@ -204,6 +204,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.138  2005/08/09 09:04:12  hawk
+- release 8 (7 for Ra)
+
 Revision 1.137  2005/06/18 11:08:41  twittner
 - fix pure-config url
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/pure-ftpd.spec?r1=1.137r2=1.138f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: amavisd-new-config.patch - updated to 2.3.2 - works for m...

2005-08-09 Thread hawk 
Author: hawk Date: Tue Aug  9 19:47:52 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated to 2.3.2
- works for me, release 2 (1 will go to Ra)

 Files affected:
SOURCES:
   amavisd-new-config.patch (1.19 - 1.20) 

 Diffs:


Index: SOURCES/amavisd-new-config.patch
diff -u SOURCES/amavisd-new-config.patch:1.19 
SOURCES/amavisd-new-config.patch:1.20
--- SOURCES/amavisd-new-config.patch:1.19   Thu Mar 31 09:56:30 2005
+++ SOURCES/amavisd-new-config.patchTue Aug  9 21:47:47 2005
@@ -164,12 +164,12 @@
 -  ### http://mks.com.pl/english.html
 -  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
 -'-s {}/*', [0], [1,2],
--qr/--[ \t]*(.+)/ ], 
+-qr/--[ \t]*(.+)/ ],
 +#  Moved to secondary scanner
 +#  ### http://mks.com.pl/english.html
 +#  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
 +#'-s {}/*', [0], [1,2],
-+#qr/--[ \t]*(.+)/ ], 
++#qr/--[ \t]*(.+)/ ],
  
### http://mks.com.pl/english.html
['MkS_Vir daemon', 'mksscan',


 CVS-web:

http://cvs.pld-linux.org/SOURCES/amavisd-new-config.patch?r1=1.19r2=1.20f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: skipstone.spec - release 11 to rebuild with new mozilla

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 06:43:58 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 11 to rebuild with new mozilla

 Files affected:
SPECS:
   skipstone.spec (1.81 - 1.82) 

 Diffs:


Index: SPECS/skipstone.spec
diff -u SPECS/skipstone.spec:1.81 SPECS/skipstone.spec:1.82
--- SPECS/skipstone.spec:1.81   Sun May 15 22:48:29 2005
+++ SPECS/skipstone.specWed Aug 10 08:43:53 2005
@@ -5,7 +5,7 @@
 Summary(pt_BR):Browser que usa o toolkit GTK+ e o engine gecko do 
Mozilla para renderizaçăo
 Name:  skipstone
 Version:   0.9.3
-Release:   10
+Release:   11
 License:   GPL
 Group: X11/Applications/Networking
 #Source0Download: http://www.muhri.net/skipstone/page.php3?node=download
@@ -162,6 +162,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.82  2005/08/10 06:43:53  hawk
+- release 11 to rebuild with new mozilla
+
 Revision 1.81  2005/05/15 20:48:29  ankry
 - req. exact mozilla ver., rel. 10
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/skipstone.spec?r1=1.81r2=1.82f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: galeon.spec - release 4 to rebuild with mozilla 1.7.11

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:04:42 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 4 to rebuild with mozilla 1.7.11

 Files affected:
SPECS:
   galeon.spec (1.234 - 1.235) 

 Diffs:


Index: SPECS/galeon.spec
diff -u SPECS/galeon.spec:1.234 SPECS/galeon.spec:1.235
--- SPECS/galeon.spec:1.234 Fri Jul 15 17:40:41 2005
+++ SPECS/galeon.spec   Wed Aug 10 09:04:37 2005
@@ -17,7 +17,7 @@
 Summary(zh_CN):ťůÓÚGeckoľÄGNOMEÁ÷ŔŔĆ÷
 Name:  galeon
 Version:   1.3.21
-Release:   3
+Release:   4
 Epoch: 2
 License:   GPL
 Group: X11/Applications/Networking
@@ -162,6 +162,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.235  2005/08/10 07:04:37  hawk
+- release 4 to rebuild with mozilla 1.7.11
+
 Revision 1.234  2005/07/15 15:40:41  saq
 - rel 3 for rebuild with mozilla 1.7.8
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/galeon.spec?r1=1.234r2=1.235f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: epiphany.spec - release 5 to rebuild with mozilla 1.7.11

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:07:47 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 5 to rebuild with mozilla 1.7.11

 Files affected:
SPECS:
   epiphany.spec (1.100 - 1.101) 

 Diffs:


Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.100 SPECS/epiphany.spec:1.101
--- SPECS/epiphany.spec:1.100   Wed Jul 27 22:29:03 2005
+++ SPECS/epiphany.spec Wed Aug 10 09:07:42 2005
@@ -7,7 +7,7 @@
 Summary(pl):   Epiphany - przeglądarka WWW dla GNOME
 Name:  epiphany
 Version:   1.6.4
-Release:   4
+Release:   5
 License:   GPL v2
 Group: X11/Applications/Networking
 Source0:   
http://ftp.gnome.org/pub/gnome/sources/epiphany/1.6/%{name}-%{version}.tar.bz2
@@ -167,6 +167,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.101  2005/08/10 07:07:42  hawk
+- release 5 to rebuild with mozilla 1.7.11
+
 Revision 1.100  2005/07/27 20:29:03  freetz
 - rel.4 for rebuild with mozilla 1.7.10
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.100r2=1.101f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: epiphany-extensions.spec - release 4 to rebuild with mozill...

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:09:58 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 4 to rebuild with mozilla 1.7.11

 Files affected:
SPECS:
   epiphany-extensions.spec (1.38 - 1.39) 

 Diffs:


Index: SPECS/epiphany-extensions.spec
diff -u SPECS/epiphany-extensions.spec:1.38 SPECS/epiphany-extensions.spec:1.39
--- SPECS/epiphany-extensions.spec:1.38 Wed Jul 27 22:30:19 2005
+++ SPECS/epiphany-extensions.spec  Wed Aug 10 09:09:53 2005
@@ -6,7 +6,7 @@
 Summary(pl):   Zbiór rozszerzeń dla Epiphany
 Name:  epiphany-extensions
 Version:   1.6.4
-Release:   3
+Release:   4
 License:   GPL v2
 Group: X11/Applications/Networking
 Source0:   
http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.6/%{name}-%{version}.tar.bz2
@@ -92,6 +92,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.39  2005/08/10 07:09:53  hawk
+- release 4 to rebuild with mozilla 1.7.11
+
 Revision 1.38  2005/07/27 20:30:19  freetz
 - rel.3 for rebuild with mozila 1.7.10
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.38r2=1.39f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: pinball_2005-04-17_1.7.jar

2005-08-10 Thread hawk 

Files fetched: 1

STORED: http://mozilla-themes.schellen.net/pinball_2005-04-17_1.7.jar
15b0fb2e86393000720422052355a6fc  pinball_2005-04-17_1.7.jar
Size: 660761 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: mozilla-theme-pinball.spec - updated to version dated 2005....

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:34:48 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- updated to version dated 2005.04.17 (for mozilla 1.7.x)

 Files affected:
SPECS:
   mozilla-theme-pinball.spec (1.18 - 1.19) 

 Diffs:


Index: SPECS/mozilla-theme-pinball.spec
diff -u SPECS/mozilla-theme-pinball.spec:1.18 
SPECS/mozilla-theme-pinball.spec:1.19
--- SPECS/mozilla-theme-pinball.spec:1.18   Sat Nov 20 18:05:47 2004
+++ SPECS/mozilla-theme-pinball.specWed Aug 10 09:34:42 2005
@@ -3,13 +3,13 @@
 Summary(pl):   Przepiękny motyw - idealny kompromis pomiędzy rozmiarem i 
czytelnością
 Name:  mozilla-theme-pinball
 %define_realname   pinball
-Version:   2004.09.15
-%define_snap   2004-09-15_1.7
+Version:   2005.04.17
+%define_snap   2005-04-17_1.7
 Release:   1
 License:   GPL
 Group: X11/Applications/Networking
 Source0:   http://mozilla-themes.schellen.net/%{_realname}_%{_snap}.jar
-# Source0-md5: 05ba8980ee9b8380fce214db6d98f014
+# Source0-md5: 15b0fb2e86393000720422052355a6fc
 Source1:   %{_realname}-installed-chrome.txt
 URL:   http://mozilla-themes.schellen.net/
 Requires(post,postun): mozilla = 5:1.7.3-3
@@ -58,6 +58,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.19  2005/08/10 07:34:42  hawk
+- updated to version dated 2005.04.17 (for mozilla 1.7.x)
+
 Revision 1.18  2004/11/20 17:05:47  qboosh
 - mozilla epoch
 


 CVS-web:

http://cvs.pld-linux.org/SPECS/mozilla-theme-pinball.spec?r1=1.18r2=1.19f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: unrar.spec - release 2 (1 is for Ra)

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:54:30 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 2 (1 is for Ra)

 Files affected:
SPECS:
   unrar.spec (1.54 - 1.55) 

 Diffs:


Index: SPECS/unrar.spec
diff -u SPECS/unrar.spec:1.54 SPECS/unrar.spec:1.55
--- SPECS/unrar.spec:1.54   Wed Aug 10 00:12:19 2005
+++ SPECS/unrar.specWed Aug 10 09:54:25 2005
@@ -6,7 +6,7 @@
 Summary(uk):   ňĎÚĐÁËĎ×Ő×ÁŢ ĆÁĘĚŚ× .zip
 Name:  unrar
 Version:   3.5.3
-Release:   1
+Release:   2
 License:   Freeware
 Group: Applications/Archiving
 #Source0Download: http://www.rarlab.com/rar_add.htm
@@ -83,6 +83,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.55  2005/08/10 07:54:25  hawk
+- release 2 (1 is for Ra)
+
 Revision 1.54  2005/08/09 22:12:19  areq
 - 3.5.3
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/unrar.spec?r1=1.54r2=1.55f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): unrar.spec - updated to 3.5.3

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 07:56:08 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 3.5.3

 Files affected:
SPECS:
   unrar.spec (1.41.2.4 - 1.41.2.5) 

 Diffs:


Index: SPECS/unrar.spec
diff -u SPECS/unrar.spec:1.41.2.4 SPECS/unrar.spec:1.41.2.5
--- SPECS/unrar.spec:1.41.2.4   Sat May 14 22:39:42 2005
+++ SPECS/unrar.specWed Aug 10 09:56:03 2005
@@ -5,12 +5,12 @@
 Summary(ru):   ňÁÓĐÁËĎ×ÝÉË ĆÁĘĚĎ× .zip
 Summary(uk):   ňĎÚĐÁËĎ×Ő×ÁŢ ĆÁĘĚŚ× .zip
 Name:  unrar
-Version:   3.5.2
+Version:   3.5.3
 Release:   1
 License:   Freeware
 Group: Applications/Archiving
 Source0:   http://www.rarlab.com/rar/%{name}src-%{version}.tar.gz
-# Source0-md5: bd2bf020e3b33cb6872856c62cd6f580
+# Source0-md5: 4e8b975374064b774ea80067e11ccf13
 Source1:   %{name}.1
 Source2:   %{name}.1.pl
 Patch0:%{name}-include.patch
@@ -77,6 +77,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.41.2.5  2005/08/10 07:56:03  hawk
+- updated to 3.5.3
+
 Revision 1.41.2.4  2005/05/14 20:39:42  hawk
 - updated to 3.5.2
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/unrar.spec?r1=1.41.2.4r2=1.41.2.5f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: whois.spec - release 2 (1 went to Ra)

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 08:04:10 2005 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 2 (1 went to Ra)

 Files affected:
SPECS:
   whois.spec (1.79 - 1.80) 

 Diffs:


Index: SPECS/whois.spec
diff -u SPECS/whois.spec:1.79 SPECS/whois.spec:1.80
--- SPECS/whois.spec:1.79   Sat Aug  6 15:37:14 2005
+++ SPECS/whois.specWed Aug 10 10:04:05 2005
@@ -5,7 +5,7 @@
 Summary(uk):   đĎËŇÁÝĹÎÉĘ ËĚŚ¤ÎÔ WHOIS
 Name:  whois
 Version:   4.7.6
-Release:   1
+Release:   2
 License:   GPL
 Group: Networking/Utilities
 Source0:   
http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.gz
@@ -80,6 +80,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.80  2005/08/10 08:04:05  hawk
+- release 2 (1 went to Ra)
+
 Revision 1.79  2005/08/06 13:37:14  qboosh
 - updated to 4.7.6
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/whois.spec?r1=1.79r2=1.80f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (RA-branch): whois.spec - updated to 4.7.6

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 08:03:23 2005 GMT
Module: SPECS Tag: RA-branch
 Log message:
- updated to 4.7.6

 Files affected:
SPECS:
   whois.spec (1.51.2.5 - 1.51.2.6) 

 Diffs:


Index: SPECS/whois.spec
diff -u SPECS/whois.spec:1.51.2.5 SPECS/whois.spec:1.51.2.6
--- SPECS/whois.spec:1.51.2.5   Sat May 14 22:40:07 2005
+++ SPECS/whois.specWed Aug 10 10:03:18 2005
@@ -4,13 +4,13 @@
 Summary(ru):   őĚŐŢŰĹÎÎŮĘ ËĚÉĹÎÔ WHOIS
 Summary(uk):   đĎËŇÁÝĹÎÉĘ ËĚŚ¤ÎÔ WHOIS
 Name:  whois
-Version:   4.7.4
+Version:   4.7.6
 Release:   1
 License:   GPL
 Group: Networking/Utilities
 #Source0:  http://www.linux.it/~md/software/%{name}_%{version}.tar.gz
 Source0:   
http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.gz
-# Source0-md5: 4ca2fd5ce1cf97576e4e6e47b121b417
+# Source0-md5: a8cd09769bafa67a8517244d1068b534
 Patch0:%{name}-Makefile.patch
 URL:   http://www.linux.it/~md/software/
 BuildRequires: gettext-devel
@@ -80,6 +80,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.51.2.6  2005/08/10 08:03:18  hawk
+- updated to 4.7.6
+
 Revision 1.51.2.5  2005/05/14 20:40:07  hawk
 - updated to 4.7.4
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/whois.spec?r1=1.51.2.5r2=1.51.2.6f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: nss_ldap-CAN-2005-2069.patch (NEW), openldap-CAN-2005-206...

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 10:25:12 2005 GMT
Module: SOURCES   Tag: HEAD
 Log message:
811ea6e5428ee0a4d3d848b4f3f893fe  nss_ldap-CAN-2005-2069.patch
4591bdcf0bd459c6fdbcabc93f5b6b55  openldap-CAN-2005-2069.patch
b9c4286d38a1e35b660f7b6a1fa09c85  pam-pam_ldap-CAN-2005-2069.patch

 Files affected:
SOURCES:
   nss_ldap-CAN-2005-2069.patch (NONE - 1.1)  (NEW), 
openldap-CAN-2005-2069.patch (NONE - 1.1)  (NEW), 
pam-pam_ldap-CAN-2005-2069.patch (NONE - 1.1)  (NEW)

 Diffs:


Index: SOURCES/nss_ldap-CAN-2005-2069.patch
diff -u /dev/null SOURCES/nss_ldap-CAN-2005-2069.patch:1.1
--- /dev/null   Wed Aug 10 12:25:12 2005
+++ SOURCES/nss_ldap-CAN-2005-2069.patchWed Aug 10 12:25:07 2005
@@ -0,0 +1,40 @@
+--- ldap-nss.c 2005-07-16 15:45:17.0 +0100
 ldap-nss.c.new 2005-07-16 15:46:15.0 +0100
+@@ -330,6 +330,37 @@
+ 
+   timelimit = __session.ls_config-ldc_bind_timelimit;
+ 
++#ifdef HAVE_LDAP_START_TLS_S
++  if (__session.ls_config-ldc_ssl_on == SSL_START_TLS)
++{
++  int version;
++
++  if (ldap_get_option
++(__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
++ version) == LDAP_OPT_SUCCESS)
++  {
++if (version  LDAP_VERSION3)
++  {
++version = LDAP_VERSION3;
++ldap_set_option (__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
++ version);
++  }
++  }
++
++  debug (== start_tls);
++  if (ldap_start_tls_s (__session.ls_conn, NULL, NULL) == LDAP_SUCCESS)
++  {
++debug (TLS startup succeeded);
++  }
++  else
++  {
++debug (TLS startup failed);
++return NSS_UNAVAIL;
++  }
++  debug (== start_tls);
++}
++#endif /* HAVE_LDAP_START_TLS_S */
++
+   return do_bind (ld, timelimit, who, cred, with_sasl);
+ }
+ #else


Index: SOURCES/openldap-CAN-2005-2069.patch
diff -u /dev/null SOURCES/openldap-CAN-2005-2069.patch:1.1
--- /dev/null   Wed Aug 10 12:25:12 2005
+++ SOURCES/openldap-CAN-2005-2069.patchWed Aug 10 12:25:07 2005
@@ -0,0 +1,13 @@
+diff -urN openldap-2.2.26.orig/libraries/libldap/tls.c 
openldap-2.2.26/libraries/libldap/tls.c
+--- openldap-2.2.26.orig/libraries/libldap/tls.c   2005-01-20 
17:01:02.0 +
 openldap-2.2.26/libraries/libldap/tls.c2005-06-22 01:34:22.0 
+0100
+@@ -1738,7 +1738,8 @@
+ 
+   /* XXYYZ: this initiates operation only on default connection! */
+ 
+-  if ( ld-ld_sb != NULL  ldap_pvt_tls_inplace( ld-ld_sb ) != 0 ) {
++  if ( ( ld-ld_defconn != NULL ) ? ( ld-ld_defconn-lconn_sb != NULL  
ldap_pvt_tls_inplace( ld-ld_defconn-lconn_sb ) != 0 )
++  : ( ld-ld_sb != NULL  ldap_pvt_tls_inplace( 
ld-ld_sb ) != 0 ) ) {
+   return LDAP_LOCAL_ERROR;
+   }
+ 


Index: SOURCES/pam-pam_ldap-CAN-2005-2069.patch
diff -u /dev/null SOURCES/pam-pam_ldap-CAN-2005-2069.patch:1.1
--- /dev/null   Wed Aug 10 12:25:12 2005
+++ SOURCES/pam-pam_ldap-CAN-2005-2069.patchWed Aug 10 12:25:07 2005
@@ -0,0 +1,29 @@
+diff -urN pam_ldap-176/pam_ldap.c pam_ldap-176.new/pam_ldap.c
+--- pam_ldap-176/pam_ldap.c2004-10-01 03:33:14.0 +0100
 pam_ldap-176.new/pam_ldap.c2005-06-22 01:40:06.0 +0100
+@@ -1587,6 +1587,7 @@
+   pam_ldap_session_t *session = global_session;
+ #endif
+   char *who, *cred;
++  int rc;
+ 
+   if (session-info != NULL  session-info-bound_as_user == 1)
+ {
+@@ -1607,6 +1608,17 @@
+   }
+ }
+ 
++  if (session-conf-ssl_on == SSL_START_TLS)
++{
++  rc = ldap_start_tls_s (session-ld, NULL, NULL);
++  if (rc != LDAP_SUCCESS)
++{
++  syslog (LOG_ERR, pam_ldap: ldap_starttls_s: %s,
++  ldap_err2string (rc));
++  return PAM_SERVICE_ERR;
++}
++}
++
+   return ldap_simple_bind_s (ld, who, cred);
+ }
+ #else

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (AC-branch): openldap.spec - added fix for CAN-2005-2069

2005-08-10 Thread hawk 
Author: hawk Date: Wed Aug 10 10:34:37 2005 GMT
Module: SPECS Tag: AC-branch
 Log message:
- added fix for CAN-2005-2069

 Files affected:
SPECS:
   openldap.spec (1.201 - 1.201.2.1) 

 Diffs:


Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.201 SPECS/openldap.spec:1.201.2.1
--- SPECS/openldap.spec:1.201   Mon Jun 20 21:48:08 2005
+++ SPECS/openldap.spec Wed Aug 10 12:34:30 2005
@@ -39,7 +39,8 @@
 Patch11:   %{name}-perl.patch
 Patch12:   %{name}-pic.patch
 Patch13:   %{name}-ltinstall-mode.patch
-#Patch14:  %{name}-sendbuf.patch
+Patch14:   %{name}-CAN-2005-2069.patch
+#Patch15:  %{name}-sendbuf.patch
 URL:   http://www.openldap.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -417,6 +418,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 %{__libtoolize}
@@ -900,6 +902,9 @@
 All persons listed below can be reached at cvs_login@pld-linux.org
 
 $Log$
+Revision 1.201.2.1  2005/08/10 10:34:30  hawk
+- added fix for CAN-2005-2069
+
 Revision 1.201  2005/06/20 19:48:08  qboosh
 - pl summary for -overlay-pcache
 


 CVS-web:
http://cvs.pld-linux.org/SPECS/openldap.spec?r1=1.201r2=1.201.2.1f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

<    1   2   3   4   5   6   7   8   9   10   >