SVN: geninitrd/trunk: geninitrd geninitrd.sysconfig

[glen]

Author: glen
Date: Tue Apr  7 00:55:20 2009
New Revision: 10320

Modified:
   geninitrd/trunk/geninitrd
   geninitrd/trunk/geninitrd.sysconfig
Log:
- lzma/bzip/gzip compressors
- need to think about image extension which cames from .spec

Modified: geninitrd/trunk/geninitrd
==
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Tue Apr  7 00:55:20 2009
@@ -47,6 +47,7 @@
uname_r=$(uname -r)
echo "usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload 
]"
echo "   [--with=] [--image-version] [--fstab=] 
[--nocompress]"
+   echo "   [--compress=yes|lzma|bzip2|gzip]"
echo "   [--initrdfs=rom|initramfs|ext2|cram] 
[--modules-conf=]"
echo "   [--with-raidstart] [--without-raidstart]"
echo "   [--with-bootsplash] [--without-bootsplash]"
@@ -761,6 +762,60 @@
ln -s init $DESTDIR/linuxrc
 }
 
+# find if $symbol exists in System.map $mapfile
+sym_exists() {
+   local mapfile="$1"
+   local symbol="$2"
+   if [ ! -f $mapfile ]; then
+   # missing mapfile (not a pld kernel?)
+   return 1
+   fi
+
+   awk -vc=1 -vsymbol="$symbol" '$2 == "T" && $3 == symbol {c = 0} END 
{exit c}' $mapfile
+}
+
+# find best compressor (or forced one) for initrd
+find_compressor() {
+   local mode="$1"
+   # the best compressor list
+   local compressors='lzma bzip2 gzip'
+
+   # a specified one, take it
+   if ! is_yes "$mode"; then
+   compressors=gzip
+   fi
+
+   debug "finding compressor: $compressors (via $mode)"
+   # check for compressor validity
+   local c prog map=/boot/System.map-$kernel
+   for c in $compressors; do
+   case $c in
+   lzma)
+   sym=unlzma
+   prog=lzma
+   ;;
+   bzip2)
+   sym=bzip2
+   prog=bzip2
+   ;;
+   gzip)
+   sym=gunzip
+   prog=gzip
+   ;;
+   *)
+   die "Unknown compressor $c"
+   ;;
+   esac
+   if sym_exists $map $sum && [ -x $prog ]; then
+   echo $c
+   return
+   fi
+   done
+
+   debug "using gzip for compressor (fallback)"
+   echo gzip
+}
+
 if [ -r /etc/sysconfig/geninitrd ]; then
. /etc/sysconfig/geninitrd
 fi
@@ -861,6 +916,12 @@
-v)
verbose=-v
;;
+   --compress)
+   COMPRESS=$2
+   ;;
+   --compress=*)
+   COMPRESS="${1#--compress=}"
+   ;;
--nocompress)
COMPRESS=no
;;
@@ -1244,10 +1305,24 @@
die "Filesystem $INITRDFS not supported by $PROGRAM"
 esac
 
-if is_yes "$COMPRESS"; then
+if ! is_no "$COMPRESS"; then
tmp=$(mktemp "$target".XX) || die "mktemp failed"
-   debug "Compressing $target"
-   gzip -9 < "$IMAGE" > "$tmp"
+   compressor=$(find_compressor "$COMPRESS")
+   debug "Compressing $target with $compressor"
+
+   # TODO: the image name (specified from kernel.spec) already contains
+   # extension, which is .gz most of the time.
+   case "$compressor" in
+   lzma)
+   lzma -9 < "$IMAGE" > "$tmp"
+   ;;
+   bzip2)
+   bzip2 -9 < "$IMAGE" > "$tmp"
+   ;;
+   gzip)
+   gzip -9 < "$IMAGE" > "$tmp"
+   ;;
+   esac
mv -f "$tmp" "$target"
 else
cp -a "$IMAGE" "$target"

Modified: geninitrd/trunk/geninitrd.sysconfig
==
--- geninitrd/trunk/geninitrd.sysconfig (original)
+++ geninitrd/trunk/geninitrd.sysconfig Tue Apr  7 00:55:20 2009
@@ -4,8 +4,10 @@
 ## Modules that should be loaded before anything (i.e. jbd for ext3)
 #PREMODS=""
 
-## Should initrd be compressed?
-COMPRESS=yes
+## Compression for the initrd.
+## lzma / bzip2 / gzip.
+## yes (default) = the 'best' available is chosen.
+#COMPRESS=yes
 
 ## What filesystem to use (rom or ext2)?
 # PLD Linux kernel has only romfs compiled in.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Apr  7 00:40:06 2009
New Revision: 10319

Modified:
   geninitrd/trunk/geninitrd
Log:
- allow non-root to see usage

Modified: geninitrd/trunk/geninitrd
==
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Tue Apr  7 00:40:06 2009
@@ -761,11 +761,6 @@
ln -s init $DESTDIR/linuxrc
 }
 
-# main()
-if [ "$(id -u)" != 0 ]; then
-   die "You need to be root to generate initrd"
-fi
-
 if [ -r /etc/sysconfig/geninitrd ]; then
. /etc/sysconfig/geninitrd
 fi
@@ -918,6 +913,11 @@
exit 1
 fi
 
+# main()
+if [ "$(id -u)" != 0 ]; then
+   die "You need to be root to generate initrd"
+fi
+
 if [ -d /usr/lib64 ]; then
_lib=lib64
 else
@@ -1241,7 +1241,7 @@
(cd $DESTDIR; find . | cpio --quiet -H newc -o > "$IMAGE")
;;
   *)
-   echo "Filesystem $INITRDFS not supported by $PROGRAM";
+   die "Filesystem $INITRDFS not supported by $PROGRAM"
 esac
 
 if is_yes "$COMPRESS"; then
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: VMware-server.spec, VMware-server-isoimages.spec - up to 2.0.0 build...

[psz]

Author: psz  Date: Mon Apr  6 22:29:44 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 2.0.0 build 116503
- rel 0.8

 Files affected:
SPECS:
   VMware-server.spec (1.53 -> 1.54) , VMware-server-isoimages.spec (1.3 -> 
1.4) 

 Diffs:


Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.53 SPECS/VMware-server.spec:1.54
--- SPECS/VMware-server.spec:1.53   Wed Oct  1 20:57:47 2008
+++ SPECS/VMware-server.specTue Apr  7 00:29:38 2009
@@ -17,9 +17,10 @@
 #
 %include   /usr/lib/rpm/macros.perl
 #
-%definever 2.0
-%definesubver  84186
-%definerel 0.6
+%definever 2.0.0
+%definevixver  1.6.0
+%definesubver  116503
+%definerel 0.8
 %{expand:%%global  ccver   %(%{__cc} -dumpversion)}
 #
 Summary:   VMware Server
@@ -29,15 +30,15 @@
 Release:   %{rel}
 License:   custom, non-distributable
 Group: Applications/Emulators
-# http://www.vmware.com/beta/server/download.html
-Source0:   
http://download3.vmware.com/software/vmserver/%{name}-e.x.p-%{subver}.i386.tar.gz
-# NoSource0-md5:   30f20c55a76ba46543df0e80bd21affc
-Source1:   
http://download3.vmware.com/software/vmserver/%{name}-e.x.p-%{subver}.x86_64.tar.gz
-# NoSource1-md5:   31dcec2889bcac228f76f0914e89469b
-Source2:   
http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.i386.tar.gz
-# NoSource2-md5:   d81db3079785a7454902aed222e611ad
-Source3:   
http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.x86_64.tar.gz
-# NoSource3-md5:   bc7bdf81d14887861b4f5413e78fd539
+# http://www.vmware.com/download/server/
+Source0:   
http://download2.vmware.com/software/server/%{name}-%{ver}-%{subver}.i386.tar.gz
+# NoSource0-md5:
+Source1:   
http://download2.vmware.com/software/server/%{name}-%{ver}-%{subver}.x86_64.tar.gz
+# NoSource1-md5:
+Source2:   
http://download2.vmware.com/software/server/VMware-vix-%{vixver}-%{subver}.i386.tar.gz
+# NoSource2-md5:
+Source3:   
http://download2.vmware.com/software/server/VMware-vix-%{vixver}-%{subver}.x86_64.tar.gz
+# NoSource3-md5:
 Source4:   %{name}.png
 Source5:   %{name}.desktop
 Source6:   %{name}-authd.rc-inetd
@@ -47,9 +48,9 @@
 Source10:  %{name}-parse-locations.pl
 Source11:  %{name}-libs
 Source12:  %{name}-locations
-Patch0:%{name}-config-rc-inetd.patch
+#Patch0:   %{name}-config-rc-inetd.patch
 Patch1:%{name}-config-kernel.patch
-Patch2:%{name}-config-pam.patch
+#Patch2:   %{name}-config-pam.patch
 Patch3:%{name}-initscript.patch
 NoSource:  0
 NoSource:  1
@@ -59,6 +60,7 @@
 %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 
3:2.6.16}
 BuildRequires: libstdc++-devel
 BuildRequires: rpm-perlprov
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.449
 BuildRequires: sed >= 4.0
 Requires:  %{name}-isoimages = %{version}
@@ -254,9 +256,9 @@
 
 rm -rf lib/isoimages # packaged by %{name}-isoimages.spec
 
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 
 cd lib/modules
@@ -369,7 +371,7 @@
 ln -s vmware $RPM_BUILD_ROOT/etc/rc.d/init.d/vmware-mgmt
 
 rm $RPM_BUILD_ROOT/usr/bin/vmware-uninstall.pl
-rm $RPM_BUILD_ROOT/usr/bin/vmware-vimdump
+#rm $RPM_BUILD_ROOT/usr/bin/vmware-vimdump
 rm $RPM_BUILD_ROOT/usr/share/applications/VMware-server.desktop
 rm $RPM_BUILD_ROOT/usr/share/pixmaps/VMware-server.png
 
@@ -463,7 +465,7 @@
 %attr(555,root,root) %{_bindir}/vmware-config.pl
 %attr(555,root,root) %{_bindir}/vmware-mount
 %attr(555,root,root) %{_bindir}/vmware-vimsh
-%attr(555,root,root) %{_bindir}/vmware-vsh
+%attr(555,root,root) %{_bindir}/vmware-vim-cmd
 %attr(555,root,root) %{_bindir}/vmware-watchdog
 %attr(555,root,root) %{_bindir}/vmware-vdiskmanager
 %attr(4555,root,root) %{_sbindir}/vmware-authd
@@ -482,21 +484,22 @@
 %attr(555,root,root) %{_libdir}/vmware/bin/openssl
 %attr(555,root,root) %{_libdir}/vmware/bin/vmrun
 %attr(755,root,root) %{_libdir}/vmware/bin/vmware-hostd
-%attr(755,root,root) %{_libdir}/vmware/bin/vmware-hostd-dynamic
+#%attr(755,root,root) %{_libdir}/vmware/bin/vmware-hostd-dynamic
 %attr(555,root,root) %{_libdir}/vmware/bin/vmware-remotemks
 %attr(555,root,root) %{_libdir}/vmware/bin/vmware-remotemks-debug
-%attr(555,root,root) %{_libdir}/vmware/bin/vmware-vimdump
+#%attr(555,root,root) %{_libdir}/vmware/bin/vmware-vimdump
 %attr(555,root,root) %{_libdir}/vmware/bin/vmware-vmx-debug
 %attr(777,root,root) %{_libdir}/vmware/bin/vmware-vmx-stats
-%attr(755,root,root) %{_libdir}/vmware/bin/vmware-vsh
+%attr(755,root,root) %{_libdir}/vmware/bin/vmware-vim-cmd
+%attr(755,root,root) %{_libdir}/vmware/bin/vmware-vimsh
 
 %dir 

SVN: geninitrd/trunk/TODO

[glen]

Author: glen
Date: Tue Apr  7 00:00:08 2009
New Revision: 10318

Modified:
   geninitrd/trunk/TODO
Log:
- System.map symbols

Modified: geninitrd/trunk/TODO
==
--- geninitrd/trunk/TODO(original)
+++ geninitrd/trunk/TODOTue Apr  7 00:00:08 2009
@@ -11,3 +11,7 @@
 # dmsetup deps 360060160dac01800c462f46c2e3fdb11
 2 dependencies  : (8, 0) (8, 64)
 - consider adding lzma/bzip2 support for compressing initrd image
+ need to peek into System.map to be sure the support is available:
+00:53:43  baggins> c052e743 T unlzma [IN]
+00:54:18  baggins> c052df9a T bunzip2 [IN]
+00:55:48  baggins> c052e370 T gunzip [IN]
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: geninitrd/trunk/TODO

[glen]

Author: glen
Date: Mon Apr  6 23:50:05 2009
New Revision: 10317

Modified:
   geninitrd/trunk/TODO
Log:
- correct

Modified: geninitrd/trunk/TODO
==
--- geninitrd/trunk/TODO(original)
+++ geninitrd/trunk/TODOMon Apr  6 23:50:05 2009
@@ -6,9 +6,8 @@
 - missing module are not critical (but write big warning about this)
 - tmpfs /dev hints from: https://wiki.ubuntu.com/ReplacementInit
 - use dmsetup deps to find dmraid, dm-multipath, lvm2 deps:
-- consider adding lzma/bzip2 support for compressing initrd image
-
 # dmsetup deps 360060160dac01800c462f46c2e3fdb11p2
 1 dependencies  : (254, 7)
 # dmsetup deps 360060160dac01800c462f46c2e3fdb11
 2 dependencies  : (8, 0) (8, 64)
+- consider adding lzma/bzip2 support for compressing initrd image
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS (LINUX_2_6_27): kernel.spec - updated to 2.6.27.21

[charles]

Author: charles  Date: Mon Apr  6 21:49:53 2009 GMT
Module: SPECS Tag: LINUX_2_6_27
 Log message:
- updated to 2.6.27.21

 Files affected:
SPECS:
   kernel.spec (1.441.2.2036.2.15 -> 1.441.2.2036.2.16) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2036.2.15 SPECS/kernel.spec:1.441.2.2036.2.16
--- SPECS/kernel.spec:1.441.2.2036.2.15 Tue Mar 17 11:21:12 2009
+++ SPECS/kernel.spec   Mon Apr  6 23:49:46 2009
@@ -103,7 +103,7 @@
 %endif
 
 %definebasever 2.6.27
-%definepostver .20
+%definepostver .21
 %definerel 1
 
 %define_enable_debug_packages  0
@@ -144,7 +144,7 @@
 # Source0-md5: b3e78977aa79d3754cb7f8143d7ddabd
 %if "%{postver}" != "%{nil}"
 Source1:   http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 3edf81af0b4a48fc3a7c27101d11d67f
+# Source1-md5: 9297d56c7e47f2977593d92e218228f2
 %endif
 
 Source3:   kernel-autoconf.h
@@ -1670,6 +1670,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.441.2.2036.2.16  2009/04/06 21:49:46  charles
+- updated to 2.6.27.21
+
 Revision 1.441.2.2036.2.15  2009/03/17 10:21:12  arekm
 - up to 2.6.27.20
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.2036.2.15&r2=1.441.2.2036.2.16&f=u

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

SPECS (Titanium): kernel-vanilla.spec - updated to 2.6.27.21

[charles]

Author: charles  Date: Mon Apr  6 21:49:24 2009 GMT
Module: SPECS Tag: Titanium
 Log message:
- updated to 2.6.27.21

 Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.86 -> 1.43.2.11.2.87) 

 Diffs:


Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.86 
SPECS/kernel-vanilla.spec:1.43.2.11.2.87
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.86Tue Mar 17 14:37:18 2009
+++ SPECS/kernel-vanilla.spec   Mon Apr  6 23:49:18 2009
@@ -14,7 +14,7 @@
 %definehave_isa1
 
 %define_basever2.6.27
-%define_postver.20
+%define_postver.21
 %define_rel1
 
 %define_enable_debug_packages  0
@@ -42,7 +42,7 @@
 # Source0-md5: b3e78977aa79d3754cb7f8143d7ddabd
 %if "%{_postver}" != "%{nil}"
 Source1:   http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 3edf81af0b4a48fc3a7c27101d11d67f
+# Source1-md5: 9297d56c7e47f2977593d92e218228f2
 %endif
 
 Source2:   kernel-vanilla-autoconf.h
@@ -904,6 +904,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.87  2009/04/06 21:49:18  charles
+- updated to 2.6.27.21
+
 Revision 1.43.2.11.2.86  2009/03/17 13:37:18  hawk
 - updated to 2.6.27.20
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.43.2.11.2.86&r2=1.43.2.11.2.87&f=u

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

SOURCES: kernel-wrr.patch - use proper peek

[baggins]

Author: baggins  Date: Mon Apr  6 21:47:33 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- use proper peek

 Files affected:
SOURCES:
   kernel-wrr.patch (1.5 -> 1.6) 

 Diffs:


Index: SOURCES/kernel-wrr.patch
diff -u SOURCES/kernel-wrr.patch:1.5 SOURCES/kernel-wrr.patch:1.6
--- SOURCES/kernel-wrr.patch:1.5Mon Apr  6 23:32:41 2009
+++ SOURCES/kernel-wrr.patchMon Apr  6 23:47:27 2009
@@ -1262,7 +1262,7 @@
 +  band = heap_root(&q->h);
 +
 +  /* Dequeue the packet from the root */
-+  return q->bands[band].que->peek(q->bands[band].que);
++  return qdisc_peek_head(q->bands[band].que);
 +}
 +
 +static unsigned int wrr_drop(struct Qdisc *sch)


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-wrr.patch?r1=1.5&r2=1.6&f=u

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

SPECS: kernel.spec - esfq/wrr updated for 2.6.29

[baggins]

Author: baggins  Date: Mon Apr  6 21:33:14 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- esfq/wrr updated for 2.6.29

 Files affected:
SPECS:
   kernel.spec (1.665 -> 1.666) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.665 SPECS/kernel.spec:1.666
--- SPECS/kernel.spec:1.665 Mon Apr  6 21:40:22 2009
+++ SPECS/kernel.spec   Mon Apr  6 23:33:08 2009
@@ -39,8 +39,8 @@
 %bcond_withnfsroot # build with root on NFS support
 
 %bcond_withimq # imq support
-%bcond_withwrr # wrr support (broken on 2.6.29)
-%bcond_withesfq# esfq support (broken on 2.6.29)
+%bcond_without wrr # wrr support
+%bcond_without esfq# esfq support
 %bcond_without ipv6# ipv6 support
 
 %bcond_without vserver # support for VServer (enabled by default)
@@ -1635,6 +1635,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.666  2009/04/06 21:33:08  baggins
+- esfq/wrr updated for 2.6.29
+
 Revision 1.665  2009/04/06 19:40:22  arekm
 - rel 0.2
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.665&r2=1.666&f=u

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

SOURCES: kernel-wrr.patch - fix line count

[baggins]

Author: baggins  Date: Mon Apr  6 21:32:47 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fix line count

 Files affected:
SOURCES:
   kernel-wrr.patch (1.4 -> 1.5) 

 Diffs:


Index: SOURCES/kernel-wrr.patch
diff -u SOURCES/kernel-wrr.patch:1.4 SOURCES/kernel-wrr.patch:1.5
--- SOURCES/kernel-wrr.patch:1.4Mon Apr  6 23:23:52 2009
+++ SOURCES/kernel-wrr.patchMon Apr  6 23:32:41 2009
@@ -10,7 +10,7 @@
  /* Generic queue statistics, available for all the elements.
 Particular schedulers may have also their private records.
   */
-@@ -482,4 +484,97 @@
+@@ -482,4 +484,96 @@
  
  #define NETEM_DIST_SCALE  8192
  


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-wrr.patch?r1=1.4&r2=1.5&f=u

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

SOURCES: kernel-wrr.patch - updated for 2.6.29

[baggins]

Author: baggins  Date: Mon Apr  6 21:23:58 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 2.6.29

 Files affected:
SOURCES:
   kernel-wrr.patch (1.3 -> 1.4) 

 Diffs:


Index: SOURCES/kernel-wrr.patch
diff -u SOURCES/kernel-wrr.patch:1.3 SOURCES/kernel-wrr.patch:1.4
--- SOURCES/kernel-wrr.patch:1.3Tue Mar 31 17:46:28 2009
+++ SOURCES/kernel-wrr.patchMon Apr  6 23:23:52 2009
@@ -87,7 +87,6 @@
 +  int nodes_in_heap;  /* Current number of bands wanting to send 
something */
 +  int bands_cur;  /* Current number of bands used (i.e.: MAC/IP 
addresses seen) */
 +  int bands_reused;   /* Number of times this band has been reused. */
-+  int packets_requed; /* Number of times packets have been requeued. 
*/
 +  __u64   priosum;/* Sum of priorities in heap where 1 is 2^32 */
 +};
 +
@@ -246,7 +245,7 @@
 diff -urN linux-2.6.26.2.org/net/sched/wrr.c linux-2.6.26.2/net/sched/wrr.c
 --- linux-2.6.26.2.org/net/sched/wrr.c 1970-01-01 01:00:00.0 +0100
 +++ linux-2.6.26.2/net/sched/wrr.c 2008-08-20 16:40:09.0 +0200
-@@ -0,0 +1,1386 @@
+@@ -0,0 +1,1357 @@
 
+/*-
 +Weighted Round Robin scheduler.
 +  
@@ -906,8 +905,6 @@
 +
 +  struct tc_wrr_qdisc_modf qdisc_modf; /* Penalty updating */
 +
-+  int packets_requed; /* Statistics */
-+
 +  struct mac_head filter; /* The filter */
 +  int bandc;  /* Number of bands */
 +};
@@ -1074,7 +1071,6 @@
 +  /* Initialize values */
 +  q->counter_low_penal = 0;
 +  q->counter_high_penal = penalty_base_t_max >> 1;
-+  q->packets_requed = 0;
 +
 +  /* Initialize empty heap */
 +  heap_init(&q->h, q->bandc, q->poll);
@@ -1118,7 +1114,6 @@
 +  /* Reset own values */
 +  q->counter_low_penal = 0;
 +  q->counter_high_penal = penalty_base_t_max >> 1;
-+  q->packets_requed = 0;
 +
 +  /* Reset filter */
 +  mac_reset(&q->filter);
@@ -1254,44 +1249,20 @@
 +  return 0;
 +}
 +
-+static int wrr_requeue(struct sk_buff *skb, struct Qdisc *sch)
++static struct sk_buff *wrr_peek(struct Qdisc *sch)
 +{
 +  struct wrr_sched_data *q = qdisc_priv(sch);
-+  struct Qdisc *qdisc;
-+  int ret;
-+
-+  /* Find band we took it from */
-+  int band = mac_classify(&q->filter, skb);
-+  if (band < 0) {
-+  /* Who should now free the pakcet? */
-+  printk(KERN_DEBUG
-+ "sch_wrr: Oops - packet requeued could never have been 
queued.\n");
-+  sch->qstats.drops++;
-+  return ENQUEUE_FAIL;
-+  }
-+
-+  q->packets_requed++;
-+
-+  /* Try to requeue it on that machine */
-+  qdisc = q->bands[band].que;
++  int band;
 +
-+  if ((ret = qdisc->ops->requeue(skb, qdisc)) == ENQUEUE_SUCCESS) {
-+  /* On success */
-+  sch->q.qlen++;
-+  sch->qstats.requeues++;
++  /* Return if heap is empty */
++  if (heap_empty(&q->h))
++  return NULL;
 +
-+  /* We should restore priority information - but we don't
-+   *
-+   * p=heap_get_penalty(&q->h,band);
-+   * ...
-+   * heap_set_penalty(&q->h,band,p);
-+   */
++  /* Find root element */
++  band = heap_root(&q->h);
 +
-+  return ENQUEUE_SUCCESS;
-+  } else {
-+  sch->qstats.drops++;
-+  return ret;
-+  }
++  /* Dequeue the packet from the root */
++  return q->bands[band].que->peek(q->bands[band].que);
 +}
 +
 +static unsigned int wrr_drop(struct Qdisc *sch)
@@ -1328,7 +1299,6 @@
 +  opt.nodes_in_heap = q->h.elements;
 +  opt.bands_cur = q->filter.mac_cur;
 +  opt.bands_reused = q->filter.mac_reused;
-+  opt.packets_requed = q->packets_requed;
 +  opt.priosum = q->priosum;
 +
 +  if (q->proxydict) {
@@ -1608,7 +1578,7 @@
 +  .priv_size = sizeof(struct wrr_sched_data),
 +  .enqueue = wrr_enqueue,
 +  .dequeue = wrr_dequeue,
-+  .requeue = wrr_requeue,
++  .peek = wrr_peek,
 +  .drop = wrr_drop,
 +  .init = wrr_init,
 +  .reset = wrr_reset,


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-wrr.patch?r1=1.3&r2=1.4&f=u

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

SOURCES: kernel-esfq.patch - fix line count

[baggins]

Author: baggins  Date: Mon Apr  6 21:10:58 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fix line count

 Files affected:
SOURCES:
   kernel-esfq.patch (1.3 -> 1.4) 

 Diffs:


Index: SOURCES/kernel-esfq.patch
diff -u SOURCES/kernel-esfq.patch:1.3 SOURCES/kernel-esfq.patch:1.4
--- SOURCES/kernel-esfq.patch:1.3   Mon Apr  6 23:08:41 2009
+++ SOURCES/kernel-esfq.patch   Mon Apr  6 23:10:52 2009
@@ -90,7 +90,7 @@
 diff -Naur linux-2.6.24.orig/net/sched/sch_esfq.c 
linux-2.6.24/net/sched/sch_esfq.c
 --- linux-2.6.24.orig/net/sched/sch_esfq.c 1969-12-31 16:00:00.0 
-0800
 +++ linux-2.6.24/net/sched/sch_esfq.c  2008-01-28 00:27:22.0 -0800
-@@ -0,0 +1,703 @@
+@@ -0,0 +1,700 @@
 +/*
 + * net/sched/sch_esfq.c   Extended Stochastic Fairness Queueing 
discipline.
 + *


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-esfq.patch?r1=1.3&r2=1.4&f=u

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

SPECS: lighttpd.spec - spawned php provides webserver(php)

[blues]

Author: bluesDate: Mon Apr  6 21:08:55 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- spawned php provides webserver(php)

 Files affected:
SPECS:
   lighttpd.spec (1.285 -> 1.286) 

 Diffs:


Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.285 SPECS/lighttpd.spec:1.286
--- SPECS/lighttpd.spec:1.285   Wed Apr  1 17:55:38 2009
+++ SPECS/lighttpd.spec Mon Apr  6 23:08:49 2009
@@ -778,6 +778,7 @@
 Requires:  %{name}-mod_fastcgi = %{version}-%{release}
 Requires:  php-fcgi
 Obsoletes: lighttpd-php-external
+Provides:  webserver(php)
 
 %description php-spawned
 PHP support via FastCGI, spawned by lighttpd.
@@ -1318,6 +1319,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.286  2009/04/06 21:08:49  blues
+- spawned php provides webserver(php)
+
 Revision 1.285  2009/04/01 15:55:38  glen
 - urls to module docs
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lighttpd.spec?r1=1.285&r2=1.286&f=u

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

SOURCES: kernel-esfq.patch - updated for 2.6.29

[baggins]

Author: baggins  Date: Mon Apr  6 21:08:46 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated for 2.6.29

 Files affected:
SOURCES:
   kernel-esfq.patch (1.2 -> 1.3) 

 Diffs:


Index: SOURCES/kernel-esfq.patch
diff -u SOURCES/kernel-esfq.patch:1.2 SOURCES/kernel-esfq.patch:1.3
--- SOURCES/kernel-esfq.patch:1.2   Tue Mar 31 14:04:21 2009
+++ SOURCES/kernel-esfq.patch   Mon Apr  6 23:08:41 2009
@@ -465,20 +465,17 @@
 +  return NET_XMIT_CN;
 +}
 +
-+
-+static int esfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
++static struct sk_buff *esfq_peek(struct Qdisc* sch)
 +{
 +  struct esfq_sched_data *q = qdisc_priv(sch);
-+  esfq_q_enqueue(skb, q, ESFQ_HEAD);
-+  sch->qstats.backlog += skb->len;
-+  if (++sch->q.qlen < q->limit - 1) {
-+  sch->qstats.requeues++;
-+  return 0;
-+  }
++  esfq_index a;
++
++  /* No active slots */
++  if (q->tail == q->depth)
++  return NULL;
 +
-+  sch->qstats.drops++;
-+  esfq_drop(sch);
-+  return NET_XMIT_CN;
++  a = q->next[q->tail];
++  return skb_peek(&q->qs[a]);
 +}
 +
 +static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
@@ -773,7 +770,7 @@
 +  .priv_size  =   sizeof(struct esfq_sched_data),
 +  .enqueue=   esfq_enqueue,
 +  .dequeue=   esfq_dequeue,
-+  .requeue=   esfq_requeue,
++  .peek   =   esfq_peek,
 +  .drop   =   esfq_drop,
 +  .init   =   esfq_init,
 +  .reset  =   esfq_reset,


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-esfq.patch?r1=1.2&r2=1.3&f=u

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

SPECS: bash.spec - up to 4.0.17

[arekm]

Author: arekmDate: Mon Apr  6 20:52:27 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 4.0.17

 Files affected:
SPECS:
   bash.spec (1.197 -> 1.198) 

 Diffs:


Index: SPECS/bash.spec
diff -u SPECS/bash.spec:1.197 SPECS/bash.spec:1.198
--- SPECS/bash.spec:1.197   Tue Mar 10 08:59:14 2009
+++ SPECS/bash.spec Mon Apr  6 22:52:21 2009
@@ -6,7 +6,7 @@
 %bcond_without tests   # do not perform "make test"
 #
 %definever 4.0
-%definepatchlevel  10
+%definepatchlevel  17
 %definerel 1
 Summary:   GNU Bourne Again Shell (bash)
 Summary(fr.UTF-8): Le shell Bourne Again de GNU
@@ -316,6 +316,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.198  2009/04/06 20:52:21  arekm
+- up to 4.0.17
+
 Revision 1.197  2009/03/10 07:59:14  arekm
 - up to 4.0.10
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bash.spec?r1=1.197&r2=1.198&f=u

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

SOURCES: bash40-011 (NEW), bash40-012 (NEW), bash40-013 (NEW), bash40-014 (...

[arekm]

Author: arekmDate: Mon Apr  6 20:46:43 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- new

 Files affected:
SOURCES:
   bash40-011 (NONE -> 1.1)  (NEW), bash40-012 (NONE -> 1.1)  (NEW), bash40-013 
(NONE -> 1.1)  (NEW), bash40-014 (NONE -> 1.1)  (NEW), bash40-015 (NONE -> 1.1) 
 (NEW), bash40-016 (NONE -> 1.1)  (NEW), bash40-017 (NONE -> 1.1)  (NEW)

 Diffs:


Index: SOURCES/bash40-011
diff -u /dev/null SOURCES/bash40-011:1.1
--- /dev/null   Mon Apr  6 22:46:44 2009
+++ SOURCES/bash40-011  Mon Apr  6 22:46:36 2009
@@ -0,0 +1,49 @@
+BASH PATCH REPORT
+=
+
+Bash-Release:  4.0
+Patch-ID:  bash40-011
+
+Bug-Reported-by:   Matt Zyzik n
+Bug-Reference-ID:  <20090312015018.c0074138...@ice.filescope.com>
+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00092.html
+
+Bug-Description:
+
+When using the new |& operator following a simple command with a redirection,
+the redirection of stderr through the pipe was not performed under certain
+circumstances.
+
+Patch:
+
+*** ../bash-4.0-patched/parse.y2009-03-08 21:24:47.0 -0400
+--- parse.y2009-03-12 21:36:23.0 -0400
+***
+*** 1123,1127 
+ REDIRECT *r;
+  
+!tc = $1;
+ rd.dest = 1;
+ r = make_redirection (2, r_duplicating_output, rd);
+--- 1123,1127 
+ REDIRECT *r;
+  
+!tc = $1->type == cm_simple ? (COMMAND 
*)$1->value.Simple : $1;
+ rd.dest = 1;
+ r = make_redirection (2, r_duplicating_output, rd);
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.0 -0500
+--- patchlevel.h   2009-02-22 16:11:31.0 -0500
+***
+*** 26,30 
+ looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 
+ looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+


Index: SOURCES/bash40-012
diff -u /dev/null SOURCES/bash40-012:1.1
--- /dev/null   Mon Apr  6 22:46:45 2009
+++ SOURCES/bash40-012  Mon Apr  6 22:46:36 2009
@@ -0,0 +1,47 @@
+BASH PATCH REPORT
+=
+
+Bash-Release:  4.0
+Patch-ID:  bash40-012
+
+Bug-Reported-by:   "Clark J. Wang" 
+Bug-Reference-ID:  

+Bug-Reference-URL: 
http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00129.html
+
+Bug-Description:
+
+A case statement using the ;& pattern terminator followed immediately by
+"esac" caused a core dump due to a null pointer dereference.
+
+Patch:
+
+*** ../bash-4.0-patched/execute_cmd.c  2009-02-13 16:41:41.0 -0500
+--- execute_cmd.c  2009-03-14 13:23:00.0 -0400
+***
+*** 2931,2935 
+   }
+ while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = 
clauses->next));
+!if ((clauses->flags & CASEPAT_TESTNEXT) == 0)
+   EXIT_CASE ();
+ else
+--- 2931,2935 
+   }
+ while ((clauses->flags & CASEPAT_FALLTHROUGH) && (clauses = 
clauses->next));
+!if (clauses == 0 || (clauses->flags & CASEPAT_TESTNEXT) == 0)
+   EXIT_CASE ();
+ else
+*** ../bash-4.0/patchlevel.h   2009-01-04 14:32:40.0 -0500
+--- patchlevel.h   2009-02-22 16:11:31.0 -0500
+***
+*** 26,30 
+ looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 
+ looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */


Index: SOURCES/bash40-013
diff -u /dev/null SOURCES/bash40-013:1.1
--- /dev/null   Mon Apr  6 22:46:45 2009
+++ SOURCES/bash40-013  Mon Apr  6 22:46:36 2009
@@ -0,0 +1,153 @@
+BASH PATCH REPORT
+=
+
+Bash-Release:  4.0
+Patch-ID:  bash40-013
+
+Bug-Reported-by:   jida...@jidanni.org
+Bug-Reference-ID:
+Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165
+
+Bug-Description:
+
+Though references to $@ when there are no positional parameters will now
+cause the shell to exit if the `errexit' option has been enabled, constructs
+such as ${@:-foo} should not cause an exit.
+
+Patch:
+
+*** ../bash-4.0-patched/subst.c2009-03-08 21:24:39.0 -0400
+--- subst.c2009-03-14 19:04:10.0 -0400
+**

SPECS: kernel.spec - rel 0.2

[arekm]

Author: arekmDate: Mon Apr  6 19:40:28 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 0.2

 Files affected:
SPECS:
   kernel.spec (1.664 -> 1.665) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.664 SPECS/kernel.spec:1.665
--- SPECS/kernel.spec:1.664 Mon Apr  6 21:15:28 2009
+++ SPECS/kernel.spec   Mon Apr  6 21:40:22 2009
@@ -113,7 +113,7 @@
 
 %definebasever 2.6.29
 %definepostver .1
-%definerel 0.1
+%definerel 0.2
 
 %define_enable_debug_packages  0
 
@@ -1635,6 +1635,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.665  2009/04/06 19:40:22  arekm
+- rel 0.2
+
 Revision 1.664  2009/04/06 19:15:28  arekm
 - esfq/wrr off (broken on 2.6.29)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.664&r2=1.665&f=u

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

SPECS: lftp.spec - added pl.po-update patch

[qboosh]

Author: qboosh   Date: Mon Apr  6 19:23:03 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- added pl.po-update patch

 Files affected:
SPECS:
   lftp.spec (1.267 -> 1.268) 

 Diffs:


Index: SPECS/lftp.spec
diff -u SPECS/lftp.spec:1.267 SPECS/lftp.spec:1.268
--- SPECS/lftp.spec:1.267   Sat Mar 21 11:43:29 2009
+++ SPECS/lftp.spec Mon Apr  6 21:22:58 2009
@@ -31,6 +31,7 @@
 Source2:   %{name}.desktop
 Patch0:%{name}-home_etc.patch
 Patch1:%{name}-makefile.patch
+Patch2:%{name}-pl.po-update.patch
 URL:   http://lftp.yar.ru/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -78,6 +79,7 @@
 %setup -q
 #%%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm -f po/stamp-po
 
@@ -143,6 +145,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.268  2009/04/06 19:22:58  qboosh
+- added pl.po-update patch
+
 Revision 1.267  2009/03/21 10:43:29  arekm
 - up to 3.7.11
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lftp.spec?r1=1.267&r2=1.268&f=u

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

SOURCES: lftp-pl.po-update.patch - for 3.7.11

[qboosh]

Author: qboosh   Date: Mon Apr  6 19:22:40 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- for 3.7.11

 Files affected:
SOURCES:
   lftp-pl.po-update.patch (1.42 -> 1.43) 

 Diffs:


Index: SOURCES/lftp-pl.po-update.patch
diff -u /dev/null SOURCES/lftp-pl.po-update.patch:1.43
--- /dev/null   Mon Apr  6 21:22:41 2009
+++ SOURCES/lftp-pl.po-update.patch Mon Apr  6 21:22:34 2009
@@ -0,0 +1,131 @@
+--- lftp-3.7.11/po/pl.po.orig  2009-03-20 17:53:18.0 +0100
 lftp-3.7.11/po/pl.po   2009-04-06 19:41:36.665720511 +0200
+@@ -1,16 +1,16 @@
+ # Polish translation of lftp.
+ # Copyright (C) 1998-2000 Free Software Foundation, Inc.
+ # Arkadiusz Mi�kiewicz , 1998-2004
+-# Jakub Bogusz , 2002-2008
++# Jakub Bogusz , 2002-2009
+ # some updates by Tomasz K�oczko , 2003
+ # Adam Go��biowski , 2004-2006
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: lftp 3.7.1\n"
++"Project-Id-Version: lftp 3.7.11\n"
+ "Report-Msgid-Bugs-To: lftp-b...@lftp.yar.ru\n"
+ "POT-Creation-Date: 2009-03-20 19:53+0300\n"
+-"PO-Revision-Date: 2008-05-06 21:20+0200\n"
++"PO-Revision-Date: 2009-04-06 19:34+0200\n"
+ "Last-Translator: Jakub Bogusz \n"
+ "Language-Team: Polish \n"
+ "MIME-Version: 1.0\n"
+@@ -759,9 +759,8 @@
+ msgstr "nieprawid�owa liczba zmiennoprzecinkowa"
+ 
+ #: src/ResMgr.cc:478
+-#, fuzzy
+ msgid "invalid unsigned number"
+-msgstr "nieprawid�owy numer"
++msgstr "nieprawid�owa liczba bez znaku"
+ 
+ #: src/ResMgr.cc:707
+ msgid "Invalid time unit letter, only [smhd] are allowed."
+@@ -831,11 +830,11 @@
+ 
+ #: src/SleepJob.cc:100
+ msgid "Sleeping forever"
+-msgstr ""
++msgstr "Zasypianie na zawsze"
+ 
+ #: src/SleepJob.cc:101
+ msgid "Sleep time left: "
+-msgstr ""
++msgstr "Pozosta�y czas snu: "
+ 
+ #: src/SleepJob.cc:110
+ #, c-format
+@@ -1908,6 +1907,11 @@
+ "lftp will automatically terminate when all jobs are finished.\n"
+ "Use `fg' shell command to return to lftp if it is still running.\n"
+ msgstr ""
++"\n"
++"lftp teraz oszukuje pow�ok�, aby przej�� do grupy proces�w w tle.\n"
++"lftp nadal dzia�a w tle wbrew komunikatowi `Zatrzymany'.\n"
++"Wy��czy si� automatycznie, kiedy wszystkie zadania zostan� zako�czone.\n"
++"Aby powr�ci� do lftp, je�li nadal dzia�a, nale�y u�y� polecenia `fg'.\n"
+ 
+ #: src/commands.cc:877 src/commands.cc:3336
+ #, c-format
+@@ -2155,11 +2159,23 @@
+ "You should have received a copy of the GNU General Public License\n"
+ "along with LFTP.  If not, see .\n"
+ msgstr ""
++"LFTP to oprogramowanie wolnodost�pne: mo�na je rozprowadza� i/lub\n"
++"modyfikowa� na warunkach Powszechnej Licencji Publicznej GNU (General\n"
++"Public License), opublikowanej przez Free Software Foundation, w wersji\n"
++"3 lub wy�szej.\n"
++"\n"
++"Ten program jest rozprowadzany w nadziei, �e b�dzie przydatny, ale BEZ\n"
++"�ADNEJ GWARANCJI, nawet bez domy�lnej gwarancji SPRZEDAWALNO�CI lub\n"
++"PRZYDATNO�CI DO KONKRETNYCH ZASTOSOWA�. Szczeg��y znajduj� si�\n"
++"w Powszechnej Licencji Publicznej GNU.\n"
++"\n"
++"Kopia Powszechnej Licencji Publicznej GNU powinna by� dostarczona wraz\n"
++"z LFTP. Je�li nie, mo�na j� znale�� pod .\n"
+ 
+ #: src/commands.cc:2590
+-#, fuzzy, c-format
++#, c-format
+ msgid "Send bug reports and questions to the mailing list <%s>.\n"
+-msgstr "Raporty o b��dach oraz pytania prosz� przesy�a� do <%s>.\n"
++msgstr "Raporty o b��dach oraz pytania prosz� przesy�a� na list� <%s>.\n"
+ 
+ #: src/commands.cc:2596
+ msgid "Libraries used: "
+@@ -2516,11 +2532,10 @@
+ msgstr "ftp:proxy has�o: "
+ 
+ #: src/resource.cc:68
+-#, fuzzy
+ msgid ""
+ "ftp:proxy-auth-type must be one of: user, joined, joined-acct, open, proxy-"
+ "u...@host"
+-msgstr "ftp:proxy-auth-type musi by� jednym z: user, joined, joined-acct, 
open"
++msgstr "ftp:proxy-auth-type musi by� jednym z: user, joined, joined-acct, 
open, proxy-u...@host"
+ 
+ #: src/resource.cc:92
+ msgid "only PUT and POST values allowed"
+@@ -2558,32 +2573,3 @@
+ #, c-format
+ msgid "%s ok, %d file$|s$ removed\n"
+ msgstr "%s ok, %d plik$|i|�w$ usuni�to\n"
+-
+-#~ msgid "day"
+-#~ msgstr "dzie�"
+-
+-#~ msgid "hour"
+-#~ msgstr "godzina"
+-
+-#~ msgid "minute"
+-#~ msgstr "minuta"
+-
+-#~ msgid "second"
+-#~ msgstr "sekunda"
+-
+-#~ msgid ""
+-#~ "LFTP is free software, covered by the GNU General Public License, and you 
"
+-#~ "are\n"
+-#~ "welcome to change it and/or distribute copies of it under certain "
+-#~ "conditions.\n"
+-#~ "There is absolutely no warranty for LFTP.  See COPYING for details.\n"
+-#~ msgstr ""
+-#~ "LFTP to oprogramowanie wolnodost�pne, chronione Powszechn� Licencj� "
+-#~ "Publiczn�\n"
+-#~ "GNU (General Public License), pozwalaj�c� modyfikowa� i/lub "
+-#~ "rozpowszechnia�\n"
+-#~ "kopie pod pewnymi warunkami.\n"
+-#~ "Nie ma �adnej gwarancji na LFTP. Szczeg��y w pliku COPYING.\n"
+-
+-#~ msgid "block size"
+-#~ msgstr "rozmiar b

SPECS: kernel.spec - esfq/wrr off (broken on 2.6.29)

[arekm]

Author: arekmDate: Mon Apr  6 19:15:34 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- esfq/wrr off (broken on 2.6.29)

 Files affected:
SPECS:
   kernel.spec (1.663 -> 1.664) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.663 SPECS/kernel.spec:1.664
--- SPECS/kernel.spec:1.663 Mon Apr  6 20:48:43 2009
+++ SPECS/kernel.spec   Mon Apr  6 21:15:28 2009
@@ -39,7 +39,8 @@
 %bcond_withnfsroot # build with root on NFS support
 
 %bcond_withimq # imq support
-%bcond_without wrr # wrr support
+%bcond_withwrr # wrr support (broken on 2.6.29)
+%bcond_withesfq# esfq support (broken on 2.6.29)
 %bcond_without ipv6# ipv6 support
 
 %bcond_without vserver # support for VServer (enabled by default)
@@ -826,9 +827,10 @@
 %patch51 -p1
 %endif
 
-# XXX: 2.6.29 fixme
 # esfq
-# %patch53 -p1
+%if %{with esfq}
+%patch53 -p1
+%endif
 
 %if %{with wrr}
 %patch52 -p1
@@ -1633,6 +1635,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.664  2009/04/06 19:15:28  arekm
+- esfq/wrr off (broken on 2.6.29)
+
 Revision 1.663  2009/04/06 18:48:43  vip
 - fix booting with lzma image ("bad header" error)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.663&r2=1.664&f=u

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

PLDWWW: Donations/Hardware

[arekm]

Author: arekm   Date: Mon Apr  6 18:11:52 2009 GMT
Module: PLDWWW   URL: 
http://www.pld-linux.org/Donations/Hardware?action=diff&rev2=63&rev1=62
 Log message:


 Page affected: Donations/Hardware

 Diffs:


  
  Here is the list of the hardware we need:
  
- [wiki:Machines/ymir ymir.pld-linux.org] (priority)
+ [wiki:Machines/ymir ymir.pld-linux.org]
+ (priority)
  
* 4GB of FB-DIMM memory (cost ~500PLN including VAT)
  
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: k9copy-2.3.1-Source.tar.gz

[rotom]

Files fetched: 1

STORED: http://master.dl.sourceforge.net/k9copy/k9copy-2.3.1-Source.tar.gz
791b72e6509be427fbae4187f47b8733  k9copy-2.3.1-Source.tar.gz
Size: 1482231 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: k9copy.spec - up to 2.3.1

[rotom]

Author: rotomDate: Mon Apr  6 19:03:40 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 2.3.1

 Files affected:
SPECS:
   k9copy.spec (1.28 -> 1.29) 

 Diffs:


Index: SPECS/k9copy.spec
diff -u SPECS/k9copy.spec:1.28 SPECS/k9copy.spec:1.29
--- SPECS/k9copy.spec:1.28  Fri Feb 20 19:32:29 2009
+++ SPECS/k9copy.spec   Mon Apr  6 21:03:35 2009
@@ -2,12 +2,12 @@
 Summary:   A vamps frontend
 Summary(pl.UTF-8): Frontend do programu vamps
 Name:  k9copy
-Version:   2.2.0
+Version:   2.3.1
 Release:   1
 License:   GPL
 Group: X11/Applications/Multimedia
 Source0:   
http://dl.sourceforge.net/k9copy/%{name}-%{version}-Source.tar.gz
-# Source0-md5: 3a31468c8166cb2977ebbb1bc8c1f975
+# Source0-md5: 791b72e6509be427fbae4187f47b8733
 Patch0:%{name}-desktop.patch
 URL:   http://k9copy.sourceforge.net/
 BuildRequires: OpenGL-GLU-devel
@@ -79,6 +79,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.29  2009/04/06 19:03:35  rotom
+- up to 2.3.1
+
 Revision 1.28  2009/02/20 18:32:29  rotom
 - up to 2.2.0
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/k9copy.spec?r1=1.28&r2=1.29&f=u

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

SPECS: kernel.spec - fix booting with lzma image ("bad header" error)

[vip]

Author: vip  Date: Mon Apr  6 18:48:49 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- fix booting with lzma image ("bad header" error)

 Files affected:
SPECS:
   kernel.spec (1.662 -> 1.663) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.662 SPECS/kernel.spec:1.663
--- SPECS/kernel.spec:1.662 Mon Apr  6 20:44:57 2009
+++ SPECS/kernel.spec   Mon Apr  6 20:48:43 2009
@@ -363,7 +363,7 @@
 AutoReqProv:   no
 BuildRequires: /sbin/depmod
 BuildRequires: gcc >= 5:3.2
-BuildRequires: lzma >= 1:4.999.5
+BuildRequires: xz >= 1:4.999.7
 # for hostname command
 BuildRequires: net-tools
 BuildRequires: perl-base
@@ -1633,6 +1633,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.663  2009/04/06 18:48:43  vip
+- fix booting with lzma image ("bad header" error)
+
 Revision 1.662  2009/04/06 18:44:57  arekm
 - grsec updated to 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.662&r2=1.663&f=u

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

SPECS: kernel.spec - grsec updated to http://www.grsecurity.net/~spender/gr...

[arekm]

Author: arekmDate: Mon Apr  6 18:45:03 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- grsec updated to 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch

 Files affected:
SPECS:
   kernel.spec (1.661 -> 1.662) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.661 SPECS/kernel.spec:1.662
--- SPECS/kernel.spec:1.661 Mon Apr  6 19:38:42 2009
+++ SPECS/kernel.spec   Mon Apr  6 20:44:57 2009
@@ -343,7 +343,7 @@
 # based on http://www.grsecurity.net/~paxguy1/pax-linux-2.6.24.6-test45.patch
 Patch9998: kernel-pax.patch
 
-# based on 
http://www.grsecurity.net/~spender/grsecurity-2.1.12-2.6.28-200901161810.patch
+# based on 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch
 # NOTE: put raw upstream patches on kernel-grsec_full.patch:GRSECURITY_RAW for 
reference
 #   (since upstream deletes older patches)
 Patch: kernel-grsec_full.patch
@@ -1633,6 +1633,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.662  2009/04/06 18:44:57  arekm
+- grsec updated to 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch
+
 Revision 1.661  2009/04/06 17:38:42  arekm
 - vs2.3 updated; grsec note
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.661&r2=1.662&f=u

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

SOURCES: kernel-grsec_full.patch - up to http://www.grsecurity.net/~spender...

[arekm]

Author: arekmDate: Mon Apr  6 18:42:56 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- up to 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch

 Files affected:
SOURCES:
   kernel-grsec_full.patch (1.3 -> 1.4) 

 Diffs:


Index: SOURCES/kernel-grsec_full.patch
diff -u SOURCES/kernel-grsec_full.patch:1.3 SOURCES/kernel-grsec_full.patch:1.4
--- SOURCES/kernel-grsec_full.patch:1.3 Tue Mar 31 17:50:01 2009
+++ SOURCES/kernel-grsec_full.patch Mon Apr  6 20:42:50 2009
@@ -4203,7 +4203,7 @@
 diff -urNp linux-2.6.29/arch/x86/include/asm/boot.h 
linux-2.6.29/arch/x86/include/asm/boot.h
 --- linux-2.6.29/arch/x86/include/asm/boot.h   2009-03-23 19:12:14.0 
-0400
 +++ linux-2.6.29/arch/x86/include/asm/boot.h   2009-03-28 14:26:18.0 
-0400
-@@ -11,10 +11,15 @@
+@@ -13,10 +13,15 @@
  #ifdef __KERNEL__
  
  /* Physical address where kernel should be loaded. */
@@ -4218,7 +4218,7 @@
 +#endif
 +
  #ifdef CONFIG_KERNEL_BZIP2
- define BOOT_HEAP_SIZE 0x40
+ #define BOOT_HEAP_SIZE 0x40
  #else /* !CONFIG_KERNEL_BZIP2 */
 diff -urNp linux-2.6.29/arch/x86/include/asm/cache.h 
linux-2.6.29/arch/x86/include/asm/cache.h
 --- linux-2.6.29/arch/x86/include/asm/cache.h  2009-03-23 19:12:14.0 
-0400
@@ -18051,7 +18051,7 @@
 diff -urNp linux-2.6.29/fs/ext3/balloc.c linux-2.6.29/fs/ext3/balloc.c
 --- linux-2.6.29/fs/ext3/balloc.c  2009-03-23 19:12:14.0 -0400
 +++ linux-2.6.29/fs/ext3/balloc.c  2009-03-28 14:26:20.0 -0400
-@@ -1435,7 +1435,7 @@
+@@ -1435,7 +1435,7 @@ static int ext3_has_free_blocks(struct s
DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
  
cond = (free_blocks < root_blocks + 1 &&
@@ -19106,7 +19106,7 @@
 diff -urNp linux-2.6.29/fs/open.c linux-2.6.29/fs/open.c
 --- linux-2.6.29/fs/open.c 2009-03-23 19:12:14.0 -0400
 +++ linux-2.6.29/fs/open.c 2009-03-28 15:24:51.0 -0400
-@@ -205,6 +205,9 @@ int do_truncate(struct dentry *dentry, l
+@@ -214,6 +214,9 @@
if (length < 0)
return -EINVAL;
  
@@ -19116,7 +19116,7 @@
newattrs.ia_size = length;
newattrs.ia_valid = ATTR_SIZE | time_attrs;
if (filp) {
-@@ -509,6 +512,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
+@@ -518,6 +521,9 @@
if (__mnt_is_readonly(path.mnt))
res = -EROFS;
  
@@ -19126,7 +19126,7 @@
  out_path_release:
path_put(&path);
  out:
-@@ -535,6 +541,8 @@ SYSCALL_DEFINE1(chdir, const char __user
+@@ -544,6 +550,8 @@
if (error)
goto dput_and_out;
  
@@ -19135,7 +19135,7 @@
set_fs_pwd(current->fs, &path);
  
  dput_and_out:
-@@ -561,6 +569,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
+@@ -570,6 +578,13 @@
goto out_putf;
  
error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
@@ -19149,7 +19149,7 @@
if (!error)
set_fs_pwd(current->fs, &file->f_path);
  out_putf:
-@@ -586,7 +601,18 @@ SYSCALL_DEFINE1(chroot, const char __use
+@@ -595,7 +610,18 @@
if (!capable(CAP_SYS_CHROOT))
goto dput_and_out;
  
@@ -19168,7 +19168,7 @@
error = 0;
  dput_and_out:
path_put(&path);
-@@ -614,13 +640,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
+@@ -623,13 +649,28 @@
err = mnt_want_write(file->f_path.mnt);
if (err)
goto out_putf;
@@ -19197,7 +19197,7 @@
mnt_drop_write(file->f_path.mnt);
  out_putf:
fput(file);
-@@ -643,13 +684,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+@@ -656,13 +697,28 @@
error = mnt_want_write(path.mnt);
if (error)
goto dput_and_out;
@@ -19226,7 +19226,7 @@
mnt_drop_write(path.mnt);
  dput_and_out:
path_put(&path);
-@@ -662,12 +718,15 @@ SYSCALL_DEFINE2(chmod, const char __user
+@@ -675,12 +731,15 @@
return sys_fchmodat(AT_FDCWD, filename, mode);
  }
  
@@ -19591,19 +19591,19 @@
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2743,8 +2824,11 @@
-   rcu_read_unlock();
+@@ -2744,7 +2825,11 @@
if (!task)
goto out;
+ 
 +  if (gr_check_hidden_task(task))
 +  goto out_put_task;
- 
++
result = proc_pid_instantiate(dir, dentry, task, NULL);
 +out_put_task:
put_task_struct(task);
  out:
return result;
-@@ -2809,6 +2893,10 @@
+@@ -2809,6 +2894,10 @@
  {
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct task_struct *reaper = 
get_proc_task_real(filp->f_path.dentry->d_inode);
@@ -19614,7 +19614,7 @@
struct tgid_iter iter;
struct pid_namespace *ns;
  
-@@ -2827,6 +2915,20 @@
+@@ -2827,6 +2916,20 @@
for (iter = next_tgid(ns, iter);
 iter.task;

SOURCES (GRSECURITY_RAW): kernel-grsec_full.patch - raw http://www.grsecuri...

[arekm]

Author: arekmDate: Mon Apr  6 17:37:22 2009 GMT
Module: SOURCES   Tag: GRSECURITY_RAW
 Log message:
- raw 
http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.29-200903281534.patch

 Files affected:
SOURCES:
   kernel-grsec_full.patch (1.3 -> 1.3.2.1) 

 Diffs:


Index: SOURCES/kernel-grsec_full.patch
diff -u SOURCES/kernel-grsec_full.patch:1.3 
SOURCES/kernel-grsec_full.patch:1.3.2.1
--- SOURCES/kernel-grsec_full.patch:1.3 Tue Mar 31 17:50:01 2009
+++ SOURCES/kernel-grsec_full.patch Mon Apr  6 19:37:16 2009
@@ -4204,7 +4204,7 @@
 --- linux-2.6.29/arch/x86/include/asm/boot.h   2009-03-23 19:12:14.0 
-0400
 +++ linux-2.6.29/arch/x86/include/asm/boot.h   2009-03-28 14:26:18.0 
-0400
 @@ -11,10 +11,15 @@
- #ifdef __KERNEL__
+ #define ASK_VGA   0xfffd  /* ask for it at bootup */
  
  /* Physical address where kernel should be loaded. */
 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -4217,9 +4217,9 @@
 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
 +#endif
 +
- #ifdef CONFIG_KERNEL_BZIP2
- define BOOT_HEAP_SIZE 0x40
- #else /* !CONFIG_KERNEL_BZIP2 */
+ #ifdef CONFIG_X86_64
+ #define BOOT_HEAP_SIZE0x7000
+ #define BOOT_STACK_SIZE   0x4000
 diff -urNp linux-2.6.29/arch/x86/include/asm/cache.h 
linux-2.6.29/arch/x86/include/asm/cache.h
 --- linux-2.6.29/arch/x86/include/asm/cache.h  2009-03-23 19:12:14.0 
-0400
 +++ linux-2.6.29/arch/x86/include/asm/cache.h  2009-03-28 14:26:18.0 
-0400
@@ -18051,15 +18051,15 @@
 diff -urNp linux-2.6.29/fs/ext3/balloc.c linux-2.6.29/fs/ext3/balloc.c
 --- linux-2.6.29/fs/ext3/balloc.c  2009-03-23 19:12:14.0 -0400
 +++ linux-2.6.29/fs/ext3/balloc.c  2009-03-28 14:26:20.0 -0400
-@@ -1435,7 +1435,7 @@
-   DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
+@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
  
-   cond = (free_blocks < root_blocks + 1 &&
--  !capable(CAP_SYS_RESOURCE) &&
-+  !capable_nolog(CAP_SYS_RESOURCE) &&
+   free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+   root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
+-  if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
++  if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
sbi->s_resuid != current_fsuid() &&
-   (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
- 
+   (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
+   return 0;
 diff -urNp linux-2.6.29/fs/ext3/namei.c linux-2.6.29/fs/ext3/namei.c
 --- linux-2.6.29/fs/ext3/namei.c   2009-03-23 19:12:14.0 -0400
 +++ linux-2.6.29/fs/ext3/namei.c   2009-03-28 14:26:20.0 -0400
@@ -19243,34 +19243,34 @@
newattrs.ia_valid =  ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-@@ -715,7 +774,7 @@
-   error = cow_check_and_break(&path);
-   if (!error)
- #endif
--  error = chown_common(path.dentry, user, group);
-+  error = chown_common(path.dentry, user, group, path.mnt);
+@@ -698,7 +757,7 @@ SYSCALL_DEFINE3(chown, const char __user
+   error = mnt_want_write(path.mnt);
+   if (error)
+   goto out_release;
+-  error = chown_common(path.dentry, user, group);
++  error = chown_common(path.dentry, user, group, path.mnt);
mnt_drop_write(path.mnt);
  out_release:
path_put(&path);
-@@ -744,7 +803,7 @@
-   error = cow_check_and_break(&path);
-   if (!error)
- #endif
--  error = chown_common(path.dentry, user, group);
-+  error = chown_common(path.dentry, user, group, path.mnt);
+@@ -723,7 +782,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+   error = mnt_want_write(path.mnt);
+   if (error)
+   goto out_release;
+-  error = chown_common(path.dentry, user, group);
++  error = chown_common(path.dentry, user, group, path.mnt);
mnt_drop_write(path.mnt);
  out_release:
path_put(&path);
-@@ -767,7 +826,7 @@
-   error = cow_check_and_break(&path);
-   if (!error)
- #endif
--  error = chown_common(path.dentry, user, group);
-+  error = chown_common(path.dentry, user, group, path.mnt);
+@@ -742,7 +801,7 @@ SYSCALL_DEFINE3(lchown, const char __use
+   error = mnt_want_write(path.mnt);
+   if (error)
+   goto out_release;
+-  error = chown_common(path.dentry, user, group);
++  error = chown_common(path.dentry, user, group, path.mnt);
mnt_drop_write(path.mnt);
  out_release:
path_put(&path);
-@@ -790,7 +849,7 @@
+@@ -765,7 +824,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd
goto out_fput;
dentry = file->f_path

SPECS: kernel.spec - vs2.3 updated; grsec note

[arekm]

Author: arekmDate: Mon Apr  6 17:38:48 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- vs2.3 updated; grsec note

 Files affected:
SPECS:
   kernel.spec (1.660 -> 1.661) 

 Diffs:


Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.660 SPECS/kernel.spec:1.661
--- SPECS/kernel.spec:1.660 Sat Apr  4 15:01:29 2009
+++ SPECS/kernel.spec   Mon Apr  6 19:38:42 2009
@@ -280,7 +280,7 @@
 # Taken from 
http://download.opensuse.org/factory/repo/src-oss/suse/src/kernel-source-2.6.27.7-3.1.src.rpm
 Patch90:   kernel-mpt-fusion.patch
 
-# based on 
http://vserver.13thfloor.at/Experimental/patch-2.6.29-vs2.3.0.36.9-pre2.diff
+# based on 
http://vserver.13thfloor.at/Experimental/patch-2.6.29-vs2.3.0.36.9-pre3.diff
 Patch100:  kernel-vserver-2.3.patch
 Patch101:  kernel-vserver-fixes.patch
 
@@ -344,6 +344,8 @@
 Patch9998: kernel-pax.patch
 
 # based on 
http://www.grsecurity.net/~spender/grsecurity-2.1.12-2.6.28-200901161810.patch
+# NOTE: put raw upstream patches on kernel-grsec_full.patch:GRSECURITY_RAW for 
reference
+#   (since upstream deletes older patches)
 Patch: kernel-grsec_full.patch
 Patch1:kernel-grsec-caps.patch
 Patch10001:kernel-grsec-common.patch
@@ -1631,6 +1633,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.661  2009/04/06 17:38:42  arekm
+- vs2.3 updated; grsec note
+
 Revision 1.660  2009/04/04 13:01:29  lmasko
 - TuxOnIce up to stable version 3.0.
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.660&r2=1.661&f=u

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

SOURCES: kernel-vserver-2.3.patch - updated

[arekm]

Author: arekmDate: Mon Apr  6 17:27:02 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated

 Files affected:
SOURCES:
   kernel-vserver-2.3.patch (1.4 -> 1.5) 

 Diffs:


Index: SOURCES/kernel-vserver-2.3.patch
diff -u SOURCES/kernel-vserver-2.3.patch:1.4 
SOURCES/kernel-vserver-2.3.patch:1.5
--- SOURCES/kernel-vserver-2.3.patch:1.4Mon Apr  6 19:09:29 2009
+++ SOURCES/kernel-vserver-2.3.patchMon Apr  6 19:26:56 2009
@@ -8680,10 +8680,10 @@
  #define MS_NOUSER (1<<31)
  
 @@ -167,6 +170,14 @@ struct inodes_stat_t {
- #define S_NOCMTIME128 /* Do not update file c/mtime */
- #define S_SWAPFILE256 /* Do not truncate: swapon got its bmaps */
  #define S_PRIVATE 512 /* Inode is fs-internal */
-+#define S_IXUNLINK1024/* Immutable Invert on unlink */
+ #define S_ATOMIC_COPY 1024/* Pages mapped with this inode need to be
+  atomically copied (gem) */
++#define S_IXUNLINK2048/* Immutable Invert on unlink */
 +
 +/* Linux-VServer related Inode flags */
 +


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vserver-2.3.patch?r1=1.4&r2=1.5&f=u

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

SOURCES: kernel-vserver-2.3.patch up to http://vserver.13thfloor.at/Experim...

[arekm]

Author: arekmDate: Mon Apr  6 17:09:35 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
up to 
http://vserver.13thfloor.at/Experimental/patch-2.6.29-vs2.3.0.36.9-pre3.diff

 Files affected:
SOURCES:
   kernel-vserver-2.3.patch (1.3 -> 1.4) 

 Diffs:


Index: SOURCES/kernel-vserver-2.3.patch
diff -u SOURCES/kernel-vserver-2.3.patch:1.3 
SOURCES/kernel-vserver-2.3.patch:1.4
--- SOURCES/kernel-vserver-2.3.patch:1.3Tue Mar 31 14:02:41 2009
+++ SOURCES/kernel-vserver-2.3.patchMon Apr  6 19:09:29 2009
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig
 --- linux-2.6.29/arch/alpha/Kconfig2009-03-24 14:18:07.0 +0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/Kconfig  2009-03-24 
14:48:16.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig  2009-03-24 
14:48:16.0 +0100
 @@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S
 --- linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/entry.S   2009-03-24 
14:48:16.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S   2009-03-24 
14:48:16.0 +0100
 @@ -874,24 +874,15 @@ sys_getxgid:
.globl  sys_getxpid
.entsys_getxpid
@@ -45,9 +45,9 @@
ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/osf_sys.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c
 --- linux-2.6.29/arch/alpha/kernel/osf_sys.c   2009-03-24 14:18:07.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/osf_sys.c 2009-03-24 
14:48:16.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c 2009-03-24 
14:48:16.0 +0100
 @@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
  {
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c
 --- linux-2.6.29/arch/alpha/kernel/ptrace.c2008-12-25 00:26:37.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/ptrace.c  2009-02-22 
22:54:24.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c  2009-02-22 
22:54:24.0 +0100
 @@ -15,6 +15,7 @@
  #include 
  #include 
@@ -68,9 +68,9 @@
  
  #include 
  #include 
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S
 --- linux-2.6.29/arch/alpha/kernel/systbls.S   2009-03-24 14:18:08.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/systbls.S 2009-03-24 
14:48:16.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S 2009-03-24 
14:48:16.0 +0100
 @@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c 
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/traps.c
 --- linux-2.6.29/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/traps.c   2009-02-22 
22:54:24.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/traps.c   2009-02-22 
22:54:24.0 +0100
 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --m

SOURCES (LINUX_2_6_28): linux-2.6-vs2.3.patch - revert

[arekm]

Author: arekmDate: Mon Apr  6 17:08:13 2009 GMT
Module: SOURCES   Tag: LINUX_2_6_28
 Log message:
- revert

 Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.55.4.2 -> 1.2.4.11.2.55.4.3) 

 Diffs:


Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.2 
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.3
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.2 Mon Apr  6 19:03:58 2009
+++ SOURCES/linux-2.6-vs2.3.patch   Mon Apr  6 19:08:06 2009
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig
 linux-2.6.29/arch/alpha/Kconfig2009-03-24 14:18:07.0 +0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig  2009-03-24 
14:48:16.0 +0100
-@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.28.9/arch/alpha/Kconfig 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig
+--- linux-2.6.28.9/arch/alpha/Kconfig  2008-12-25 00:26:37.0 +0100
 linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig2009-02-22 
22:54:24.0 +0100
+@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
  
@@ -10,10 +10,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S
 linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S   2009-03-24 
14:48:16.0 +0100
-@@ -874,24 +874,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/entry.S 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S
+--- linux-2.6.28.9/arch/alpha/kernel/entry.S   2009-03-31 16:25:09.0 
+0200
 linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S 2009-02-22 
22:54:24.0 +0100
+@@ -872,24 +872,15 @@ sys_getxgid:
.globl  sys_getxpid
.entsys_getxpid
  sys_getxpid:
@@ -45,10 +45,10 @@
ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c
 linux-2.6.29/arch/alpha/kernel/osf_sys.c   2009-03-24 14:18:07.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c 2009-03-24 
14:48:16.0 +0100
-@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
+diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/osf_sys.c 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.28.9/arch/alpha/kernel/osf_sys.c 2008-12-25 00:26:37.0 
+0100
 linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c   2009-02-22 
22:54:24.0 +0100
+@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
  {
if (tv) {
struct timeval ktv;
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c
 linux-2.6.29/arch/alpha/kernel/ptrace.c2008-12-25 00:26:37.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c  2009-02-22 
22:54:24.0 +0100
+diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/ptrace.c 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c
+--- linux-2.6.28.9/arch/alpha/kernel/ptrace.c  2008-12-25 00:26:37.0 
+0100
 linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c2009-02-22 
22:54:24.0 +0100
 @@ -15,6 +15,7 @@
  #include 
  #include 
@@ -68,9 +68,9 @@
  
  #include 
  #include 
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S
 linux-2.6.29/arch/alpha/kernel/systbls.S   2009-03-24 14:18:08.0 
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S 2009-03-24 
14:48:16.0 +0100
+diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/systbls.S 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S
+--- linux-2.6.28.9/arch/alpha/kernel/systbls.S 2009-03-31 16:25:09.0 
+0200
 linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S   2009-02-22 
22:54:24.0 +0100
 @@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/traps.c
 linux-2.6.29/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.0 
+0100
-+++ lin

SOURCES (LINUX_2_6_28): linux-2.6-vs2.3.patch up to http://vserver.13thfloo...

[arekm]

Author: arekmDate: Mon Apr  6 17:04:06 2009 GMT
Module: SOURCES   Tag: LINUX_2_6_28
 Log message:
up to 
http://vserver.13thfloor.at/Experimental/patch-2.6.29-vs2.3.0.36.9-pre3.diff

 Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.55.4.1 -> 1.2.4.11.2.55.4.2) 

 Diffs:


Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.1 
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.2
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55.4.1 Mon Apr  6 09:59:33 2009
+++ SOURCES/linux-2.6-vs2.3.patch   Mon Apr  6 19:03:58 2009
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/Kconfig 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig
 linux-2.6.28.9/arch/alpha/Kconfig  2008-12-25 00:26:37.0 +0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/Kconfig2009-02-22 
22:54:24.0 +0100
-@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig
+--- linux-2.6.29/arch/alpha/Kconfig2009-03-24 14:18:07.0 +0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/Kconfig  2009-03-24 
14:48:16.0 +0100
+@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
  
@@ -10,10 +10,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/entry.S 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S
 linux-2.6.28.9/arch/alpha/kernel/entry.S   2009-03-31 16:25:09.0 
+0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/entry.S 2009-02-22 
22:54:24.0 +0100
-@@ -872,24 +872,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S
+--- linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.0 
+0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/entry.S   2009-03-24 
14:48:16.0 +0100
+@@ -874,24 +874,15 @@ sys_getxgid:
.globl  sys_getxpid
.entsys_getxpid
  sys_getxpid:
@@ -45,10 +45,10 @@
ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/osf_sys.c 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c
 linux-2.6.28.9/arch/alpha/kernel/osf_sys.c 2008-12-25 00:26:37.0 
+0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/osf_sys.c   2009-02-22 
22:54:24.0 +0100
-@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.29/arch/alpha/kernel/osf_sys.c   2009-03-24 14:18:07.0 
+0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/osf_sys.c 2009-03-24 
14:48:16.0 +0100
+@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
  {
if (tv) {
struct timeval ktv;
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/ptrace.c 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c
 linux-2.6.28.9/arch/alpha/kernel/ptrace.c  2008-12-25 00:26:37.0 
+0100
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/ptrace.c2009-02-22 
22:54:24.0 +0100
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c
+--- linux-2.6.29/arch/alpha/kernel/ptrace.c2008-12-25 00:26:37.0 
+0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/ptrace.c  2009-02-22 
22:54:24.0 +0100
 @@ -15,6 +15,7 @@
  #include 
  #include 
@@ -68,9 +68,9 @@
  
  #include 
  #include 
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/systbls.S 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S
 linux-2.6.28.9/arch/alpha/kernel/systbls.S 2009-03-31 16:25:09.0 
+0200
-+++ linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/systbls.S   2009-02-22 
22:54:24.0 +0100
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S 
linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S
+--- linux-2.6.29/arch/alpha/kernel/systbls.S   2009-03-24 14:18:08.0 
+0100
 linux-2.6.29-vs2.3.0.36.9-pre3/arch/alpha/kernel/systbls.S 2009-03-24 
14:48:16.0 +0100
 @@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.28.9/arch/alpha/kernel/traps.c 
linux-2.6.28.9-vs2.3.0.36.10/arch/alpha/kernel/traps.c
 linux-2.6.28.

DISTFILES: squashfs4.0.tar.gz

[arekm]

Files fetched: 1

STORED: http://master.dl.sourceforge.net/squashfs/squashfs4.0.tar.gz
a3c23391da4ebab0ac4a75021ddabf96  squashfs4.0.tar.gz
Size: 103979 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: squashfs.spec - up to 4.0 (for kernels 2.6.29 and above)

[arekm]

Author: arekmDate: Mon Apr  6 16:56:19 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 4.0 (for kernels 2.6.29 and above)

 Files affected:
SPECS:
   squashfs.spec (1.35 -> 1.36) 

 Diffs:


Index: SPECS/squashfs.spec
diff -u SPECS/squashfs.spec:1.35 SPECS/squashfs.spec:1.36
--- SPECS/squashfs.spec:1.35Thu Oct 23 22:35:30 2008
+++ SPECS/squashfs.spec Mon Apr  6 18:56:13 2009
@@ -2,12 +2,12 @@
 Summary:   Set of tools which creates squashfs filesystem
 Summary(pl.UTF-8): Zestaw narzędzi do tworzenia systemu plików squashfs
 Name:  squashfs
-Version:   3.4
+Version:   4.0
 Release:   1
 License:   GPL
 Group: Base/Utilities
 Source0:   http://dl.sourceforge.net/squashfs/%{name}%{version}.tar.gz
-# Source0-md5: 2a4d2995ad5aa6840c95a95ffa6b1da6
+# Source0-md5: a3c23391da4ebab0ac4a75021ddabf96
 URL:   http://squashfs.sourceforge.net/
 BuildRequires: zlib-devel
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -18,7 +18,7 @@
 This package contains utilities for squashfs filesystem.
 
 Squashfs is a highly compressed read-only filesystem for Linux (kernel
-2.4.x and 2.6.x). It uses zlib compression to compress both files,
+2.6.29 and above). It uses zlib compression to compress both files,
 inodes and directories. Inodes in the system are very small and all
 blocks are packed to minimise data overhead. Block sizes greater than
 4K are supported up to a maximum of 64K.
@@ -32,7 +32,7 @@
 Zestaw narzędzi do tworzenia systemu plików squashfs.
 
 Squashfs jest systemem plików tylko do odczytu z dużym współczynnikiem
-kompresji dla Linuksa (jądra 2.4.x i 2.6.x). Używa kompresji zlib do
+kompresji dla Linuksa (2.6.29 i nowsze). Używa kompresji zlib do
 plików, i-węzłów oraz katalogów. I-węzły są bardzo małe, a wszystkie
 bloki są pakowane, aby zmniejszyć objętość. Rozmiary bloków powyżej
 4kB są obsługiwane - maksymalnie do 64kB.
@@ -70,6 +70,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.36  2009/04/06 16:56:13  arekm
+- up to 4.0 (for kernels 2.6.29 and above)
+
 Revision 1.35  2008/10/23 20:35:30  hawk
 - updated to 3.4, inlcude -D's from original Makefile in CFLAGS
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/squashfs.spec?r1=1.35&r2=1.36&f=u

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

pld-builder.new: PLD_Builder/config.py - need email being setup as early as...

[glen]

Author: glen Date: Mon Apr  6 16:53:24 2009 GMT
Module: pld-builder.new   Tag: HEAD
 Log message:
- need email being setup as early as possible as it is used in exception handler

 Files affected:
pld-builder.new/PLD_Builder:
   config.py (1.40 -> 1.41) 

 Diffs:


Index: pld-builder.new/PLD_Builder/config.py
diff -u pld-builder.new/PLD_Builder/config.py:1.40 
pld-builder.new/PLD_Builder/config.py:1.41
--- pld-builder.new/PLD_Builder/config.py:1.40  Wed Mar  4 09:12:48 2009
+++ pld-builder.new/PLD_Builder/config.py   Mon Apr  6 18:53:19 2009
@@ -49,6 +49,9 @@
 
 p.readfp(open(path.builder_conf))
 
+self.admin_email = get("admin_email")
+self.email = self.admin_email
+
 if p.has_option("all", "syslog"):
 f = p.get("all", "syslog")
 if f != "":
@@ -65,11 +68,9 @@
 self.src_builder = string.strip(get("src_builder", ""))
 self.tag_prefixes = string.split(get("tag_prefixes", ""))
 self.max_keep_time = int(get("max_keep_time", 168))*60*60
-self.max_jobs = int(get("max_jobs"))
 self.bot_email = get("bot_email", "")
 self.control_url = get("control_url")
 self.request_handler_server_port = 
int(get("request_handler_server_port", 1234))
-self.admin_email = get("admin_email")
 self.builder_list = get("builder_list", "")
 self.gen_upinfo = get("gen_upinfo", "yes")
 if self.gen_upinfo == 'no':
@@ -78,16 +79,16 @@
 self.gen_upinfo = True
 status.admin = self.admin_email
 status.builder_list = self.builder_list
-self.email = self.admin_email
+self.max_jobs = int(get("max_jobs"))
 
 if builder == "all":
 return
 
+self.email = get("email")
 if builder not in p.sections():
 log.panic("builder %s not in config file" % builder)
 self.arch = get("arch")
 self.chroot = get("chroot")
-self.email = get("email")
 self.buildlogs_url = get("buildlogs_url", "/dev/null")
 self.ftp_url = get("ftp_url")
 self.notify_url = get("notify_url")


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/config.py?r1=1.40&r2=1.41&f=u

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

DISTFILES: asymptote-1.69.src.tgz

[uzsolt]

Files fetched: 1

STORED: http://master.dl.sourceforge.net/asymptote/asymptote-1.69.src.tgz
70c8a87bf19e6cec16fd210ca32d2608  asymptote-1.69.src.tgz
Size: 1351423 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: asymptote.spec - 1.69

[uzsolt]

Author: uzsolt   Date: Mon Apr  6 15:52:50 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- 1.69

 Files affected:
SPECS:
   asymptote.spec (1.33 -> 1.34) 

 Diffs:


Index: SPECS/asymptote.spec
diff -u SPECS/asymptote.spec:1.33 SPECS/asymptote.spec:1.34
--- SPECS/asymptote.spec:1.33   Mon Mar 30 23:13:41 2009
+++ SPECS/asymptote.specMon Apr  6 17:52:45 2009
@@ -3,12 +3,12 @@
 Summary(hu.UTF-8): Asymptote egy leíró vektorgrafikus nyelv technikai 
rajzokhoz
 Summary(pl.UTF-8): Język opisu grafiki wektorowej do rysunków technicznych
 Name:  asymptote
-Version:   1.68
-Release:   2
+Version:   1.69
+Release:   1
 License:   GPL v3
 Group: Applications/Science
 Source0:   http://dl.sourceforge.net/asymptote/%{name}-%{version}.src.tgz
-# Source0-md5: 61a7819027e30a435add7d1af73425bc
+# Source0-md5: 70c8a87bf19e6cec16fd210ca32d2608
 URL:   http://asymptote.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: gc-devel >= 7.0
@@ -175,6 +175,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.34  2009/04/06 15:52:45  uzsolt
+- 1.69
+
 Revision 1.33  2009/03/30 21:13:41  qboosh
 - fixed glob
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/asymptote.spec?r1=1.33&r2=1.34&f=u

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

SPECS: upsfid.spec - init scripts

[wolvverine]

Author: wolvverine   Date: Mon Apr  6 15:51:29 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- init scripts

 Files affected:
SPECS:
   upsfid.spec (1.1 -> 1.2) 

 Diffs:


Index: SPECS/upsfid.spec
diff -u SPECS/upsfid.spec:1.1 SPECS/upsfid.spec:1.2
--- SPECS/upsfid.spec:1.1   Mon Apr  6 17:43:12 2009
+++ SPECS/upsfid.spec   Mon Apr  6 17:51:24 2009
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
 
-%defineoldname upsmon
-
 Summary:   Allows to monitor UPS from Fideltronik
 Summary(pl.UTF-8): Narzędzia do monitorowania UPS-ów firmy Fideltronik
 Name:  upsfid
@@ -12,8 +10,8 @@
 Group: Daemons
 Source0:   
http://www.fideltronik.com.pl/ups/upsmon/software/3x_linux/%{version}/%{name}-%{version}-1.tgz
 # Source0-md5: 879d6b961d4bf60158002f5b218f8dbb
-Source1:   %{oldname}.init
-Source2:   %{oldname}-client.init
+Source1:   %{name}-server.init
+Source2:   %{name}-client.init
 URL:   http://www.fideltronik.com.pl/
 ExclusiveArch: %{ix86}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -159,6 +157,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.2  2009/04/06 15:51:24  wolvverine
+- init scripts
+
 Revision 1.1  2009/04/06 15:43:12  wolvverine
 - NFY, based on upsmon.spec, up to 3.0.1
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/upsfid.spec?r1=1.1&r2=1.2&f=u

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

SOURCES: upsfid-client.init (NEW) - for upsfid

[wolvverine]

Author: wolvverine   Date: Mon Apr  6 15:50:13 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- for upsfid

 Files affected:
SOURCES:
   upsfid-client.init (NONE -> 1.1)  (NEW)

 Diffs:


Index: SOURCES/upsfid-client.init
diff -u /dev/null SOURCES/upsfid-client.init:1.1
--- /dev/null   Mon Apr  6 17:50:14 2009
+++ SOURCES/upsfid-client.init  Mon Apr  6 17:50:08 2009
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# upsmonc  This shell script takes care of starting and stopping 
upsmonc
+#
+# chkconfig:   12345 99 11
+# description: ups-management daemon for Fideltronik
+# processname: upsmonc
+#
+# pidfile: /var/run/upsmonc.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+   # Start daemons.
+   if [ ! -f /var/lock/subsys/upsmonc ]; then
+   msg_starting upsmonc
+   daemon upsmonc
+   RETVAL=$?
+   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/upsmonc
+   else
+   msg_already_running upsmonc
+   fi
+   ;;
+  stop)
+   if [ -f /var/lock/subsys/upsmonc ]; then
+   # Stop daemons.
+   msg_stopping upsmonc
+   killproc upsmonc
+   rm -f /var/lock/subsys/upsmonc >/dev/null 2>&1
+   else
+   msg_not_running upsmonc
+   fi
+   ;;
+  restart|force-reload)
+   $0 stop
+   $0 start
+   exit $?
+   ;;
+  status)
+   status upsmonc
+   exit $?
+   ;;
+  *)
+   msg_usage "$0 {start|stop|restart|force-reload|status}"
+   exit 3
+esac
+
+exit $RETVAL

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

SOURCES: upsfid-server.init (NEW) - for upsfid

[wolvverine]

Author: wolvverine   Date: Mon Apr  6 15:49:53 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- for upsfid

 Files affected:
SOURCES:
   upsfid-server.init (NONE -> 1.1)  (NEW)

 Diffs:


Index: SOURCES/upsfid-server.init
diff -u /dev/null SOURCES/upsfid-server.init:1.1
--- /dev/null   Mon Apr  6 17:49:53 2009
+++ SOURCES/upsfid-server.init  Mon Apr  6 17:49:47 2009
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# upsmons  This shell script takes care of starting and stopping 
upsmons
+#
+# chkconfig:   12345 99 11
+# description: ups-management daemon for Fideltronik
+# processname: upsmons
+#
+# pidfile: /var/run/upsmons.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+   # Start daemons.
+   if [ ! -f /var/lock/subsys/upsmons ]; then
+   msg_starting upsmons
+   daemon upsmons
+   RETVAL=$?
+   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/upsmons
+   else
+   msg_already_running upsmons
+   fi
+   ;;
+  stop)
+   if [ -f /var/lock/subsys/upsmons ]; then
+   # Stop daemons.
+   msg_stopping upsmons
+   killproc upsmons
+   rm -f /var/lock/subsys/upsmons >/dev/null 2>&1
+   else
+   msg_not_running upsmons
+   fi
+   ;;
+  restart|force-reload)
+   $0 stop
+   $0 start
+   exit $?
+   ;;
+  status)
+   status upsmons
+   exit $?
+   ;;
+  *)
+   msg_usage "$0 {start|stop|restart|force-reload|status}"
+   exit 3
+esac
+
+exit $RETVAL

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

SPECS: upsfid.spec (NEW) - NFY, based on upsmon.spec, up to 3.0.1

[wolvverine]

Author: wolvverine   Date: Mon Apr  6 15:43:18 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- NFY, based on upsmon.spec, up to 3.0.1

 Files affected:
SPECS:
   upsfid.spec (NONE -> 1.1)  (NEW)

 Diffs:


Index: SPECS/upsfid.spec
diff -u /dev/null SPECS/upsfid.spec:1.1
--- /dev/null   Mon Apr  6 17:43:18 2009
+++ SPECS/upsfid.spec   Mon Apr  6 17:43:12 2009
@@ -0,0 +1,230 @@
+# $Revision$, $Date$
+
+%defineoldname upsmon
+
+Summary:   Allows to monitor UPS from Fideltronik
+Summary(pl.UTF-8): Narzędzia do monitorowania UPS-ów firmy Fideltronik
+Name:  upsfid
+Version:   3.1.0
+Release:   0.1
+Epoch: 1
+License:   Free
+Group: Daemons
+Source0:   
http://www.fideltronik.com.pl/ups/upsmon/software/3x_linux/%{version}/%{name}-%{version}-1.tgz
+# Source0-md5: 879d6b961d4bf60158002f5b218f8dbb
+Source1:   %{oldname}.init
+Source2:   %{oldname}-client.init
+URL:   http://www.fideltronik.com.pl/
+ExclusiveArch: %{ix86}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes: upsmon
+Conflicts: upsmon
+
+%define_sysconfdir /etc/ups/fideltronik
+
+%description
+Allows to monitor UPS from Fideltronik.
+
+%description -l pl.UTF-8
+Narzędzia pozwalające na monitorowanie i bezpieczne zamknięcie systemu
+operacyjnego komputera z dołączonym zasilaczem UPS, oraz powiadamianie
+stacji roboczych z zainstalowanym UPS Monitor Client.
+
+%package server
+Summary:   UPS Monitor Server
+Summary(pl.UTF-8): Serwer monitorujący UPS
+Group: Daemons
+Requires(post,preun):  /sbin/chkconfig
+Requires:  rc-scripts
+
+%description server
+Allows to monitor UPS from Fideltronik. This package contains the UPS
+Monitor Server.
+
+%description server -l pl.UTF-8
+Serwer ten pozwala na monitorowanie i bezpieczne zamknięcie systemu
+operacyjnego komputera z dołączonym zasilaczem UPS, oraz powiadamianie
+stacji roboczych z zainstalowanym UPS Monitor Client.
+
+Ważniejsze cechy:
+   * monitoring sygnałów "awarii zasilania" i "baterii rozładowanych"
+   * bezpieczne zamknięcie systemu operacyjnego
+   * uruchamianie skryptów przy każdej zmianie stanu zasilacza UPS
+   * wyłączenie zasilacza UPS po zamknięciu systemu
+   * zapis historii stanu zasilania "LOG"
+   * informowanie stacji roboczych/serwerów w sieci LAN (TCP/IP)
+   * prosta instalacja
+
+%package client
+Summary:   UPS Monitor Client
+Summary(pl.UTF-8): Klient monitorowanie UPS-ów
+Group: Daemons
+Requires(post,preun):  /sbin/chkconfig
+Requires:  rc-scripts
+
+%description client
+Allows to monitor UPS from Fideltronik. This package contains the UPS
+Monitor Client.
+
+%description client -l pl.UTF-8
+UPS Monitor Client 2.0 jest programem odbierającym komunikaty z modułu
+UPS Monitor Server 2.x poprzez TCP/IP i wykonującym odpowiednie skrypty,
+w których można zamieścić polecenie zamknięcia lokalnego systemu.
+
+Ważniejsze cechy:
+   * obsługa komunikatów TCP/IP z maksymalnie 5-ciu serwerów (UPS Monitor 
Server)
+   * wykonywanie wybranego skryptu przy kazdej zmianie stanu zdalnego UPS-a
+   * dedykowane skrypty dla każdego zdalnego UPS-a
+   * łatwa konfiguracja w pliku tekstowym
+   * prosta instalacja
+
+%prep
+%setup -q -n %{name}-%{version}-1
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d 
$RPM_BUILD_ROOT{%{_sbindir},/sbin,%{_bindir},%{_sysconfdir}/scripts,/etc/rc.d/init.d,/var/log/fideltronik,%{_datadir}/%{name}/www/images}
+
+install cfg/* $RPM_BUILD_ROOT%{_sysconfdir}
+install bin/shutdown.sh $RPM_BUILD_ROOT%{_sysconfdir}/scripts
+install bin/{upsmonc,upsmons} $RPM_BUILD_ROOT%{_sbindir}
+install bin/upsoff $RPM_BUILD_ROOT/sbin
+install bin/xmess $RPM_BUILD_ROOT%{_bindir}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/upsmons
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/upsmonc
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post server
+/sbin/chkconfig --add upsmons
+if [ -f /var/lock/subsys/upsmons ]; then
+   /etc/rc.d/init.d/upsmons restart 1>&2
+else
+   echo "Run \"/etc/rc.d/init.d/upsd start\" to start upsmons daemon."
+fi
+
+%preun server
+if [ "$1" = "0" ]; then
+   if [ -f /var/lock/subsys/upsmons ]; then
+   /etc/rc.d/init.d/upsmons stop 1>&2
+   fi
+   /sbin/chkconfig --del upsmons
+fi
+
+%post client
+/sbin/chkconfig --add upsmonc
+if [ -f /var/lock/subsys/upsmonc ]; then
+   /etc/rc.d/init.d/upsmonc restart 1>&2
+else
+   echo "Run \"/etc/rc.d/init.d/upsc start\" to start upsmonc daemon."
+fi
+
+%preun client
+if [ "$1" = "0" ]; then
+   if [ -f /var/lock/subsys/upsmonc ]; then
+   /etc/rc.d/init.d/upsmonc stop 1>&2
+   fi
+   /sbin/chkconfig --del upsmonc
+fi
+
+%files server
+%defattr(644,root,root,755)
+%doc README
+%attr(750,root,root) %{_sbindir}/upsmons
+%attr(750,roo

DISTFILES: upsfid-3.1.0-1.tgz

[wolvverine]

Files fetched: 1

STORED: 
http://www.fideltronik.com.pl/ups/upsmon/software/3x_linux/3.1.0/upsfid-3.1.0-1.tgz
879d6b961d4bf60158002f5b218f8dbb  upsfid-3.1.0-1.tgz
Size: 91599 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: udev.spec - rel 2 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:34:27 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 2
- proper C on geninitrd

 Files affected:
SPECS:
   udev.spec (1.291 -> 1.292) 

 Diffs:


Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.291 SPECS/udev.spec:1.292
--- SPECS/udev.spec:1.291   Fri Apr  3 22:26:26 2009
+++ SPECS/udev.spec Mon Apr  6 17:34:22 2009
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6
 Name:  udev
 Version:   140
-Release:   1
+Release:   2
 Epoch: 1
 License:   GPL
 Group: Base
@@ -111,7 +111,7 @@
 Summary(pl.UTF-8): Implementacja devfs w przestrzeni użytkownika - 
statyczna binarka dla initrd
 Group: Base
 Requires:  %{name}-core = %{epoch}:%{version}-%{release}
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 A userspace implementation of devfs - static binary for initrd.
@@ -458,6 +458,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.292  2009/04/06 15:34:22  baggins
+- rel 2
+- proper C on geninitrd
+
 Revision 1.291  2009/04/03 20:26:26  areq
 - + dir %{_libdir}/initrd/udev
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.291&r2=1.292&f=u

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

SVN: geninitrd/tags/10000.10

[glen]

Author: glen
Date: Mon Apr  6 17:16:56 2009
New Revision: 10316

Added:
   geninitrd/tags/1.10/
  - copied from rev 10315, geninitrd/trunk/
Log:
- released 1.10

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

SOURCES: geninitrd-romfs.patch - update to 10000.10

[glen]

Author: glen Date: Mon Apr  6 15:16:36 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- update to 1.10

 Files affected:
SOURCES:
   geninitrd-romfs.patch (1.1 -> 1.2) 

 Diffs:


Index: SOURCES/geninitrd-romfs.patch
diff -u SOURCES/geninitrd-romfs.patch:1.1 SOURCES/geninitrd-romfs.patch:1.2
--- SOURCES/geninitrd-romfs.patch:1.1   Mon Mar 16 23:20:52 2009
+++ SOURCES/geninitrd-romfs.patch   Mon Apr  6 17:16:30 2009
@@ -1,16 +1,15 @@
 geninitrd-9000.1/geninitrd~2007-11-28 23:38:13.0 +0200
-+++ geninitrd-9000.1/geninitrd 2007-11-28 23:38:46.662253955 +0200
-@@ -1662,12 +1662,7 @@
+--- geninitrd-1.10/geninitrd~  2009-04-06 18:12:27.0 +0300
 geninitrd-1.10/geninitrd   2009-04-06 18:13:33.882133693 +0300
+@@ -948,11 +948,7 @@
+   fi
  
- if [ -z "$INITRDFS" ]; then
-   if [ -z "$FS" ]; then
--  # default value
--  if [ "$kernel_version" -ge "002005" ]; then
--  INITRDFS="initramfs"
--  else
--  INITRDFS="rom"
--  fi
-+  INITRDFS="rom"
-   else
-   warn "Warning: FS configuration options is obsoleted. Use 
INITRDFS instead"
-   INITRDFS="$FS"
+   # default value
+-  if [ "$kernel_version" -ge "002005" ]; then
+-  INITRDFS="initramfs"
+-  else
+-  INITRDFS="rom"
+-  fi
++  INITRDFS="rom"
+ fi
+ 
+ case "$INITRDFS" in


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/geninitrd-romfs.patch?r1=1.1&r2=1.2&f=u

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

SPECS: geninitrd.spec - 10000.10: %{_libdir}/initrd support

[glen]

Author: glen Date: Mon Apr  6 15:15:36 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- 1.10: %{_libdir}/initrd support

 Files affected:
SPECS:
   geninitrd.spec (2.137 -> 2.138) 

 Diffs:


Index: SPECS/geninitrd.spec
diff -u SPECS/geninitrd.spec:2.137 SPECS/geninitrd.spec:2.138
--- SPECS/geninitrd.spec:2.137  Mon Mar 16 23:21:16 2009
+++ SPECS/geninitrd.specMon Apr  6 17:15:30 2009
@@ -2,13 +2,13 @@
 Summary:   Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8): Narzędzie do tworzenia inicjalnego ramdysku używanego 
przy starcie systemu
 Name:  geninitrd
-Version:   1.3
+Version:   1.10
 # leave rel 1 for ac
-Release:   3
+Release:   2
 License:   GPL
 Group: Applications/System
 Source0:   %{name}-%{version}.tar.gz
-# Source0-md5: 1fbd532c853eace59865ebf11dc79bb3
+# Source0-md5: 0d8762e028cc82b5c804e50b54c01031
 Patch0:%{name}-romfs.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:  awk
@@ -98,6 +98,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 2.138  2009/04/06 15:15:30  glen
+- 1.10: %{_libdir}/initrd support
+
 Revision 2.137  2009/03/16 22:21:16  hawk
 - force romfs as default in Titanium if not specified otherwise
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/geninitrd.spec?r1=2.137&r2=2.138&f=u

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

DISTFILES: geninitrd-10000.10.tar.gz

[glen]

Files fetched: 1

STORED: no-url://geninitrd-1.10.tar.gz
0d8762e028cc82b5c804e50b54c01031  geninitrd-1.10.tar.gz
Size: 48185 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: lvm2.spec - one more C fixed

[baggins]

Author: baggins  Date: Mon Apr  6 15:12:31 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- one more C fixed

 Files affected:
SPECS:
   lvm2.spec (1.135 -> 1.136) 

 Diffs:


Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.135 SPECS/lvm2.spec:1.136
--- SPECS/lvm2.spec:1.135   Mon Apr  6 17:09:31 2009
+++ SPECS/lvm2.spec Mon Apr  6 17:12:26 2009
@@ -165,7 +165,7 @@
 Summary(pl.UTF-8): Wsparcie dla mapowania urządzeń w przestrzeni 
użytkownika - wersja dla initrd
 Group: Base
 Obsoletes: device-mapper-initrd-devel
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description -n device-mapper-initrd
 The goal of this driver is to support volume management. The driver
@@ -356,6 +356,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.136  2009/04/06 15:12:26  baggins
+- one more C fixed
+
 Revision 1.135  2009/04/06 15:09:31  baggins
 - rel 4
 - proper C on geninitrd


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.135&r2=1.136&f=u

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

SVN: geninitrd/trunk/ChangeLog

[glen]

Author: glen
Date: Mon Apr  6 17:12:10 2009
New Revision: 10315

Modified:
   geninitrd/trunk/ChangeLog
Log:
- update

Modified: geninitrd/trunk/ChangeLog
==
--- geninitrd/trunk/ChangeLog   (original)
+++ geninitrd/trunk/ChangeLog   Mon Apr  6 17:12:10 2009
@@ -1,3 +1,7 @@
+2009-04-06 15:11 + [r10314]  Elan Ruusamäe 
+
+   * mod-condecor.sh (added): - add missing file
+
 2009-04-06 15:05 + [r10312]  Elan Ruusamäe 
 
* Makefile: - new release supporting %{_libdir}/initrd
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: geninitrd/trunk/mod-condecor.sh

[glen]

Author: glen
Date: Mon Apr  6 17:11:52 2009
New Revision: 10314

Added:
   geninitrd/trunk/mod-condecor.sh
Log:
- add missing file

Added: geninitrd/trunk/mod-condecor.sh
==
--- (empty file)
+++ geninitrd/trunk/mod-condecor.sh Mon Apr  6 17:11:52 2009
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# geninitrd mod: condecor
+
+# requires splashutils package to operate
+FB_CON_DECOR=no
+
+# setup geninitrd module
+# @access  public
+setup_mod_condecor() {
+   if is_yes "$FB_CON_DECOR" && [ "$INITRDFS" != "initramfs" ]; then
+   warn "Using fbcondecor requires INITRDFS=initramfs; skipping 
fbcondecor generation"
+   FB_CON_DECOR=no
+   fi
+}
+
+# generate initrd fragment
+# @access  public
+initrd_gen_fbcondecor() {
+   debug "Generating fbcondecor"
+
+   if [ ! -x /usr/bin/splash_geninitramfs -a ! -x 
/usr/sbin/splash_geninitramfs ]; then
+   warn "Failed to find splash_geninitramfs. Is splashutils 
package installed?"
+   return
+   fi
+
+   local splash_geninitramfs_bin=/usr/sbin/splash_geninitramfs
+   [ -f /usr/bin/splash_geninitramfs ] && 
splash_geninitramfs_bin=/usr/bin/splash_geninitramfs
+
+   if [ -r /etc/sysconfig/splash ]; then
+   . /etc/sysconfig/splash
+   fi
+
+   if [ -z "$SPLASH_THEME" ]; then
+   warn "Please configure your /etc/sysconfig/splash first."
+   warn "Generating of splashes skipped."
+   return
+   fi
+
+   if [ -z "$FB_SPLASH_RESOLUTIONS" ]; then
+   warn "No FB_SPLASH_RESOLUTIONS specified in 
/etc/sysconfig/splash."
+   warn "Not adding fbcondecor to initramfs."
+   return
+   fi
+
+   for res in $FB_SPLASH_RESOLUTIONS; do
+   if [ -f "/etc/splash/$SPLASH_THEME/$res.cfg" ]; then
+   $splash_geninitramfs_bin -c $DESTDIR -r $res 
$SPLASH_THEME && \
+   debug "Added $res $SPLASH_THEME theme to initramfs."
+   else
+   warn "/etc/splash/$SPLASH_THEME/$res.cfg doesn't exist, 
skipped"
+   fi
+   done
+}
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: module-init-tools.spec - rel 5 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:11:05 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 5
- proper C on geninitrd

 Files affected:
SPECS:
   module-init-tools.spec (1.73 -> 1.74) 

 Diffs:


Index: SPECS/module-init-tools.spec
diff -u SPECS/module-init-tools.spec:1.73 SPECS/module-init-tools.spec:1.74
--- SPECS/module-init-tools.spec:1.73   Mon Mar 23 15:10:51 2009
+++ SPECS/module-init-tools.specMon Apr  6 17:10:59 2009
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8): Утиліти для роботи з модулями ядра
 Name:  module-init-tools
 Version:   3.5
-Release:   4
+Release:   5
 License:   GPL v2+
 Group: Applications/System
 Source0:   
http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
@@ -60,7 +60,7 @@
 Summary(pl.UTF-8): Narzędzia do modułów jądra systemu bez kerneld - 
statyczne binarki dla initrd
 Group: Applications/System
 Requires:  %{name} = %{version}-%{release}
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 Module utilities without kerneld - static binary for initrd.
@@ -159,6 +159,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.74  2009/04/06 15:10:59  baggins
+- rel 5
+- proper C on geninitrd
+
 Revision 1.73  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.73&r2=1.74&f=u

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

SPECS: mdadm.spec - rel 2 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:09:59 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 2
- proper C on geninitrd

 Files affected:
SPECS:
   mdadm.spec (1.88 -> 1.89) 

 Diffs:


Index: SPECS/mdadm.spec
diff -u SPECS/mdadm.spec:1.88 SPECS/mdadm.spec:1.89
--- SPECS/mdadm.spec:1.88   Mon Mar 23 15:10:51 2009
+++ SPECS/mdadm.specMon Apr  6 17:09:54 2009
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8): Narzędzie do tworzenia i obsługi programowych macierzy 
RAID
 Name:  mdadm
 Version:   2.6.9
-Release:   1
+Release:   2
 License:   GPL v2+
 Group: Base
 Source0:   
http://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.bz2
@@ -53,7 +53,7 @@
 Summary:   Tool for maintaining software RAID devices - initrd version
 Summary(pl.UTF-8): Narzędzie do obsługi programowych macierzy RAID, wersja 
dla initrd
 Group: Base
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 Tool for maintaining software RAID devices - statically linked for
@@ -190,6 +190,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.89  2009/04/06 15:09:54  baggins
+- rel 2
+- proper C on geninitrd
+
 Revision 1.88  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mdadm.spec?r1=1.88&r2=1.89&f=u

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

SPECS: lvm2.spec - rel 4 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:09:36 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 4
- proper C on geninitrd

 Files affected:
SPECS:
   lvm2.spec (1.134 -> 1.135) 

 Diffs:


Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.134 SPECS/lvm2.spec:1.135
--- SPECS/lvm2.spec:1.134   Mon Mar 23 15:10:51 2009
+++ SPECS/lvm2.spec Mon Apr  6 17:09:31 2009
@@ -28,7 +28,7 @@
 Summary(pl.UTF-8): Nowa wersja Logical Volume Managera dla Linuksa
 Name:  lvm2
 Version:   2.02.45
-Release:   3
+Release:   4
 License:   GPL v2
 Group: Applications/System
 Source0:   ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -87,7 +87,7 @@
 Summary:   The new version of Logical Volume Manager for Linux - initrd 
version
 Summary(pl.UTF-8): Nowa wersja Logical Volume Managera dla Linuksa - 
wersja dla initrd
 Group: Base
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 This package includes a number of utilities for creating, checking,
@@ -356,6 +356,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.135  2009/04/06 15:09:31  baggins
+- rel 4
+- proper C on geninitrd
+
 Revision 1.134  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.134&r2=1.135&f=u

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

SPECS: e2fsprogs.spec - rel 3 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:09:13 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 3
- proper C on geninitrd

 Files affected:
SPECS:
   e2fsprogs.spec (1.206 -> 1.207) 

 Diffs:


Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.206 SPECS/e2fsprogs.spec:1.207
--- SPECS/e2fsprogs.spec:1.206  Mon Mar 23 15:10:51 2009
+++ SPECS/e2fsprogs.specMon Apr  6 17:09:08 2009
@@ -37,7 +37,7 @@
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:  e2fsprogs
 Version:   1.41.4
-Release:   2
+Release:   3
 License:   GPL v2 (with LGPL v2 and BSD parts)
 Group: Applications/System
 Source0:   http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -615,7 +615,7 @@
 Summary:   blkid - initrd version
 Summary(pl.UTF-8): blkid - wersja dla initrd
 Group: Base
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 This package includes a blkid utility to recognize partitions by label
@@ -1092,6 +1092,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.207  2009/04/06 15:09:08  baggins
+- rel 3
+- proper C on geninitrd
+
 Revision 1.206  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.206&r2=1.207&f=u

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

SPECS: dmraid.spec - rel 5 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:08:46 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 5
- proper C on geninitrd

 Files affected:
SPECS:
   dmraid.spec (1.48 -> 1.49) 

 Diffs:


Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.48 SPECS/dmraid.spec:1.49
--- SPECS/dmraid.spec:1.48  Mon Mar 23 15:10:51 2009
+++ SPECS/dmraid.spec   Mon Apr  6 17:08:40 2009
@@ -10,7 +10,7 @@
 Name:  dmraid
 Version:   1.0.0
 %define_rc rc15
-Release:   0.%{_rc}.4
+Release:   0.%{_rc}.5
 License:   GPL
 Group: Base
 Source0:   
http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
@@ -92,7 +92,7 @@
 Summary:   Device-mapper RAID tool - statically linked version
 Summary(pl.UTF-8): Narzędzie do RAID-u opartego o device-mapper - wersja 
statyczna
 Group: Base
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 Statically linked version of dmraid utility.
@@ -212,6 +212,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.49  2009/04/06 15:08:40  baggins
+- rel 5
+- proper C on geninitrd
+
 Revision 1.48  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dmraid.spec?r1=1.48&r2=1.49&f=u

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

SPECS: cryptsetup-luks.spec - rel 10 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:08:20 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 10
- proper C on geninitrd

 Files affected:
SPECS:
   cryptsetup-luks.spec (1.43 -> 1.44) 

 Diffs:


Index: SPECS/cryptsetup-luks.spec
diff -u SPECS/cryptsetup-luks.spec:1.43 SPECS/cryptsetup-luks.spec:1.44
--- SPECS/cryptsetup-luks.spec:1.43 Mon Mar 23 15:10:51 2009
+++ SPECS/cryptsetup-luks.spec  Mon Apr  6 17:08:14 2009
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:  cryptsetup-luks
 Version:   1.0.6
-Release:   9
+Release:   10
 License:   GPL v2
 Group: Base
 Source0:   http://luks.endorphin.org/source/%{realname}-%{version}.tar.bz2
@@ -113,7 +113,7 @@
 Summary:   LUKS for dm-crypt implemented in cryptsetup - initrd version
 Group: Base
 Requires:  udev-initrd >= 1:115
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 This package contains implementation of LUKS for dm-crypt implemented
@@ -252,6 +252,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.44  2009/04/06 15:08:14  baggins
+- rel 10
+- proper C on geninitrd
+
 Revision 1.43  2009/03/23 14:10:51  baggins
 - unify dietlibc compile options and calls
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cryptsetup-luks.spec?r1=1.43&r2=1.44&f=u

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

SPECS: busybox.spec - rel 3 - proper C on geninitrd

[baggins]

Author: baggins  Date: Mon Apr  6 15:07:29 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 3
- proper C on geninitrd

 Files affected:
SPECS:
   busybox.spec (1.167 -> 1.168) 

 Diffs:


Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.167 SPECS/busybox.spec:1.168
--- SPECS/busybox.spec:1.167Wed Apr  1 17:00:40 2009
+++ SPECS/busybox.spec  Mon Apr  6 17:07:24 2009
@@ -36,7 +36,7 @@
 Name:  busybox
 # stable line only
 Version:   1.13.3
-Release:   2
+Release:   3
 License:   GPL
 Group: Applications
 Source0:   http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -140,7 +140,7 @@
 Summary:   Static busybox for initrd
 Summary(pl.UTF-8): Statycznie skonsolidowany busybox dla initrd
 Group: Applications
-Conflicts: geninitrd <= 1.3
+Conflicts: geninitrd < 1.10
 
 %description initrd
 Static busybox for initrd.
@@ -287,6 +287,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.168  2009/04/06 15:07:24  baggins
+- rel 3
+- proper C on geninitrd
+
 Revision 1.167  2009/04/01 15:00:40  areq
 - fix install
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/busybox.spec?r1=1.167&r2=1.168&f=u

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

SVN: geninitrd/trunk/ChangeLog

[glen]

Author: glen
Date: Mon Apr  6 17:06:16 2009
New Revision: 10313

Modified:
   geninitrd/trunk/ChangeLog
Log:
- update

Modified: geninitrd/trunk/ChangeLog
==
--- geninitrd/trunk/ChangeLog   (original)
+++ geninitrd/trunk/ChangeLog   Mon Apr  6 17:06:16 2009
@@ -1,3 +1,154 @@
+2009-04-06 15:05 + [r10312]  Elan Ruusamäe 
+
+   * Makefile: - new release supporting %{_libdir}/initrd
+
+2009-04-06 13:24 + [r10311]  Elan Ruusamäe 
+
+   * mod-uvesafb.sh: - find v86d from initrd dir
+
+2009-04-03 08:45 + [r10303]  Adam Gołębiowski 
+
+   * geninitrd: - simplified obsolete --fs* options handling
+
+2009-04-03 07:06 + [r10301]  Elan Ruusamäe 
+
+   * TODO: - lzma/bzip2 compress methods todo
+
+2009-04-02 23:36 + [r10300]  Elan Ruusamäe 
+
+   * mod-suspend.sh: - support resume from initrd_dir
+
+2009-04-02 23:32 + [r10297-10299]  Elan Ruusamäe 
+
+   * geninitrd: - verbosity
+
+   * mod-suspend.sh: - verbosity
+
+   * mod-nfs.sh: - fix nfsroot detection
+
+2009-04-02 23:21 + [r10295-10296]  Elan Ruusamäe 
+
+   * Makefile: - fix make install
+
+   * Makefile, geninitrd, mod-scsi.sh (added): - scsi modularized
+
+2009-04-02 23:13 + [r10294]  Elan Ruusamäe 
+
+   * mod-nfs.sh (added), Makefile, geninitrd: - nfs modularized
+
+2009-04-02 23:07 + [r10293]  Elan Ruusamäe 
+
+   * Makefile, mod-uvesafb.sh (added), geninitrd: - uvesafb (v86d)
+ modularized
+
+2009-04-02 22:59 + [r10292]  Elan Ruusamäe 
+
+   * geninitrd: - formatting cosmetics
+
+2009-04-02 22:56 + [r10291]  Elan Ruusamäe 
+
+   * Makefile, geninitrd, mod-bootsplash.sh (added): - bootsplash
+ modularized
+
+2009-04-02 22:52 + [r10289-10290]  Elan Ruusamäe 
+
+   * Makefile, geninitrd: - condecor modularized
+
+   * Makefile, geninitrd, mod-fbsplash.sh (added): - fbsplash
+ modularized
+
+2009-04-02 22:44 + [r10288]  Elan Ruusamäe 
+
+   * Makefile: - shorten MODS definition
+
+2009-04-02 22:39 + [r10285-10287]  Elan Ruusamäe 
+
+   * geninitrd: - load suspend module
+
+   * Makefile, geninitrd, mod-suspend.sh (added): - suspend
+ modularized
+
+   * geninitrd.8.xml: - update manual with --initrdfs argument
+
+2009-04-02 22:32 + [r10282-10284]  Elan Ruusamäe 
+
+   * geninitrd: - load tuxonice mod
+
+   * Makefile, geninitrd, mod-tuxonice.sh (added): - tuxonice
+ modularized
+
+   * mod-udev.sh: - typo
+
+2009-04-02 22:24 + [r10281]  Elan Ruusamäe 
+
+   * geninitrd: - cosmetics, deprecated options are now fatal
+
+2009-04-02 22:18 + [r10280]  Elan Ruusamäe 
+
+   * mod-blkid.sh, mod-multipath.sh, geninitrd, mod-luks.sh,
+ mod-lvm.sh, mod-dmraid.sh, mod-md.sh, mod-udev.sh: - setup
+ modules _after_ parsing command-line args
+
+2009-04-02 21:49 + [r10279]  Elan Ruusamäe 
+
+   * Makefile, geninitrd, mod-udev.sh (added): - udev modularized
+
+2009-04-02 21:38 + [r10277-10278]  Elan Ruusamäe 
+
+   * geninitrd: - share inst_exec args on failure
+
+   * mod-blkid.sh, mod-lvm.sh, mod-md.sh: - quote pathnames in feature
+ test
+
+2009-04-02 21:29 + [r10275-10276]  Elan Ruusamäe 
+
+   * geninitrd, mod-dmraid.sh: - USE_DMRAID moved to dmraid module
+
+   * mod-blkid.sh (added), Makefile, geninitrd: - blkid modularized
+
+2009-04-02 21:19 + [r10274]  Elan Ruusamäe 
+
+   * geninitrd, mod-luks.sh, mod-lvm.sh, mod-dmraid.sh, mod-md.sh: -
+ handle initrd programs under %{_libdir}/initrd
+
+2009-04-02 20:24 + [r10273]  Elan Ruusamäe 
+
+   * geninitrd, geninitrd.8.xml: - reap out --with-insmod-static
+
+2009-03-23 00:18 + [r10231-10232]  Elan Ruusamäe 
+
+   * mod-md.sh: - USEMDADMSTATIC unused
+
+   * mod-md.sh (added): - modularize mdadm
+
+2009-03-23 00:14 + [r10230]  Elan Ruusamäe 
+
+   * Makefile, geninitrd: - modularize mdadm
+
+2009-03-22 14:33 + [r10229]  Artur Frysiak 
+
+   * geninitrd: Sometime mdadm --detail are better that mdadm
+ --examine (eg. LVM on arrays with custom names) (#:~) mdadm
+ --examine --scan --brief -v --config=/etc/mdadm.conf ARRAY
+ /dev/md/s250 level=raid1 metadata=1.1 num-devices=2
+ UUID=7a2ccca1:079b02b3:4a413594:fcda5731 name=s250
+ devices=/dev/sda2 (#:~) mdadm --detail --scan --brief -v
+ --config=/etc/mdadm.conf ARRAY /dev/md127 level=raid1
+ num-devices=2 metadata=1.01 name=s250
+ UUID=7a2ccca1:079b02b3:4a413594:fcda5731 devices=/dev/sda2
+
+2009-03-19 11:42 + [r10219]  Sławomir Paszkiewicz 

+
+   * geninitrd.sysconfig: - added BOOT_SPLASH option
+
+2009-03-18 22:10 + [r10217]  Elan Ruusamäe 
+
+   * mod-luks.sh: - fixed path (be consistent)
+
+2009-03-16 11:38 + [r10215]  Elan Ruusamäe 
+
+   * mod-lvm.sh: - shorter lvm version detect
+
 2009-03-09 23:15

SVN: geninitrd/trunk/Makefile

[glen]

Author: glen
Date: Mon Apr  6 17:05:27 2009
New Revision: 10312

Modified:
   geninitrd/trunk/Makefile
Log:
- new release supporting %{_libdir}/initrd

Modified: geninitrd/trunk/Makefile
==
--- geninitrd/trunk/Makefile(original)
+++ geninitrd/trunk/MakefileMon Apr  6 17:05:27 2009
@@ -1,5 +1,5 @@
 # when making release, make sure you do it as RELEASE document describes
-VERSION:= 1.3
+VERSION:= 1.10
 MODS   := ide luks multipath dmraid lvm md blkid udev tuxonice suspend 
fbsplash condecor bootsplash uvesafb nfs scsi
 FILES_MODS  := $(MODS:%=mod-%.sh)
 FILES  := Makefile geninitrd.sysconfig geninitrd functions 
$(FILES_MODS) geninitrd.8 geninitrd.8.xml ChangeLog
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: pld-builder-0.3.20090406.tar.bz2

[glen]

Files fetched: 0

ALREADY GOT: no-url://pld-builder-0.3.20090406.tar.bz2
2284943fb952e32ecec8a0d7fd60ea8e  pld-builder-0.3.20090406.tar.bz2


-- 
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: pld-builder.spec - err, uploaded to df

[glen]

Author: glen Date: Mon Apr  6 15:00:31 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- err, uploaded to df

 Files affected:
SPECS:
   pld-builder.spec (1.59 -> 1.60) 

 Diffs:


Index: SPECS/pld-builder.spec
diff -u SPECS/pld-builder.spec:1.59 SPECS/pld-builder.spec:1.60
--- SPECS/pld-builder.spec:1.59 Mon Apr  6 16:53:11 2009
+++ SPECS/pld-builder.spec  Mon Apr  6 17:00:25 2009
@@ -7,7 +7,7 @@
 Release:   1
 License:   GPL
 Group: Development/Building
-Source0:   http://carme.pld-linux.org/~glen/%{name}-%{version}.tar.bz2
+Source0:   %{name}-%{version}.tar.bz2
 # Source0-md5: 2284943fb952e32ecec8a0d7fd60ea8e
 Source1:   %{name}.init
 Source2:   %{name}.sysconfig
@@ -336,6 +336,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.60  2009/04/06 15:00:25  glen
+- err, uploaded to df
+
 Revision 1.59  2009/04/06 14:53:11  glen
 - fresh snap
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pld-builder.spec?r1=1.59&r2=1.60&f=u

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

DISTFILES: pld-builder-0.3.20090406.tar.bz2

[glen]

Files fetched: 1

STORED: no-url://pld-builder-0.3.20090406.tar.bz2
2284943fb952e32ecec8a0d7fd60ea8e  pld-builder-0.3.20090406.tar.bz2
Size: 45463 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: suspend-diet.patch - lseek64 == lseek on 64 bit

[baggins]

Author: baggins  Date: Mon Apr  6 14:56:51 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- lseek64 == lseek on 64 bit

 Files affected:
SOURCES:
   suspend-diet.patch (1.1 -> 1.2) 

 Diffs:


Index: SOURCES/suspend-diet.patch
diff -u SOURCES/suspend-diet.patch:1.1 SOURCES/suspend-diet.patch:1.2
--- SOURCES/suspend-diet.patch:1.1  Mon Apr  6 16:48:59 2009
+++ SOURCES/suspend-diet.patch  Mon Apr  6 16:56:46 2009
@@ -93,3 +93,16 @@
return;
}
/* No more extents.  Load the next extents page. */
+--- suspend/resume.c~  2009-01-27 10:48:49.0 +0100
 suspend/resume.c   2009-04-06 16:53:52.0 +0200
+@@ -35,6 +35,10 @@
+ #include "splash.h"
+ #include "loglevel.h"
+ 
++#if defined(__dietlibc__) && (__WORDSIZE == 64)
++#define lseek64 lseek
++#endif
++
+ static char snapshot_dev_name[MAX_STR_LEN] = SNAPSHOT_DEVICE;
+ static char resume_dev_name[MAX_STR_LEN] = RESUME_DEVICE;
+ static loff_t resume_offset;


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/suspend-diet.patch?r1=1.1&r2=1.2&f=u

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

SPECS: iptables.spec - up to 1.4.3.2

[arekm]

Author: arekmDate: Mon Apr  6 14:55:49 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- up to 1.4.3.2

 Files affected:
SPECS:
   iptables.spec (1.268 -> 1.269) 

 Diffs:


Index: SPECS/iptables.spec
diff -u SPECS/iptables.spec:1.268 SPECS/iptables.spec:1.269
--- SPECS/iptables.spec:1.268   Fri Mar 27 13:49:51 2009
+++ SPECS/iptables.spec Mon Apr  6 16:55:44 2009
@@ -23,12 +23,12 @@
 Summary(uk.UTF-8): Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:  iptables
-Version:   1.4.3.1
+Version:   1.4.3.2
 Release:   1
 License:   GPL
 Group: Networking/Daemons
 Source0:   ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
-# Source0-md5: 9c67f796f69e1e016cc19e2c19357711
+# Source0-md5: 545698693b636cfc844aafc6729fd48a
 Source1:   cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2
 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
 Source2:   %{name}.init
@@ -367,7 +367,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libiptc.so.0
 %attr(755,root,root) %{_libdir}/libiptc.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxtables.so.1
+%attr(755,root,root) %ghost %{_libdir}/libxtables.so.2
 %attr(755,root,root) %{_libdir}/libxtables.so.*.*
 
 %files devel
@@ -395,6 +395,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.269  2009/04/06 14:55:44  arekm
+- up to 1.4.3.2
+
 Revision 1.268  2009/03/27 12:49:51  zbyniu
 - batch back on; rel 1
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iptables.spec?r1=1.268&r2=1.269&f=u

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

DISTFILES: iptables-1.4.3.2.tar.bz2 iptables-howtos.tar.bz2

[arekm]

Files fetched: 1

STORED: ftp://ftp.netfilter.org/pub/iptables/iptables-1.4.3.2.tar.bz2
545698693b636cfc844aafc6729fd48a  iptables-1.4.3.2.tar.bz2
Size: 432131 bytes
ALREADY GOT: no-url://iptables-howtos.tar.bz2
2ed2b452daefe70ededd75dc0061fd07  iptables-howtos.tar.bz2


-- 
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: pld-builder.spec - fresh snap

[glen]

Author: glen Date: Mon Apr  6 14:53:17 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- fresh snap

 Files affected:
SPECS:
   pld-builder.spec (1.58 -> 1.59) 

 Diffs:


Index: SPECS/pld-builder.spec
diff -u SPECS/pld-builder.spec:1.58 SPECS/pld-builder.spec:1.59
--- SPECS/pld-builder.spec:1.58 Mon Mar 30 15:52:15 2009
+++ SPECS/pld-builder.spec  Mon Apr  6 16:53:11 2009
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%definesnap20090330
+%definesnap    20090406
 Summary:   PLD RPM builder environment
 Summary(pl.UTF-8): Środowisko budowniczego pakietów RPM dla PLD
 Name:  pld-builder
@@ -8,7 +8,7 @@
 License:   GPL
 Group: Development/Building
 Source0:   http://carme.pld-linux.org/~glen/%{name}-%{version}.tar.bz2
-# Source0-md5: c79d3ec2a45a917f3b59a475a5852ec8
+# Source0-md5: 2284943fb952e32ecec8a0d7fd60ea8e
 Source1:   %{name}.init
 Source2:   %{name}.sysconfig
 URL:   http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
@@ -94,9 +94,6 @@
 
 %prep
 %setup -q
-
-mv jak-wysy?a?-zlecenia.txt jak-wysylac-zlecenia.txt
-
 %{__sed} -i -e '
s,~/pld-builder.new/,%{_sharedstatedir}/%{name}/,
/^conf_dir/s,=.*,= "%{_sysconfdir}/",
@@ -339,6 +336,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.59  2009/04/06 14:53:11  glen
+- fresh snap
+
 Revision 1.58  2009/03/30 13:52:15  glen
 - blah, distfiles is down
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pld-builder.spec?r1=1.58&r2=1.59&f=u

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

DISTFILES: ERRORS: pld-builder-0.3.20090406.tar.bz2

[glen]

wget -nv --no-check-certificate --user-agent=PLD/distfiles -O 
./tmp/1aa081a1-43ef-40d6-bc52-291f51de6214/2284943fb952e32ecec8a0d7fd60ea8e/pld-builder-0.3.20090406.tar.bz2
 "http://carme.pld-linux.org/~glen/pld-builder-0.3.20090406.tar.bz2":
http://carme.pld-linux.org/~glen/pld-builder-0.3.20090406.tar.bz2:
2009-04-06 16:53:16 ERROR 404: Not Found.


FATAL: http://carme.pld-linux.org/~glen/pld-builder-0.3.20090406.tar.bz2 
(2284943fb952e32ecec8a0d7fd60ea8e) was not fetched (wget -nv 
--no-check-certificate --user-agent=PLD/distfiles -O 
./tmp/1aa081a1-43ef-40d6-bc52-291f51de6214/2284943fb952e32ecec8a0d7fd60ea8e/pld-builder-0.3.20090406.tar.bz2
 "http://carme.pld-linux.org/~glen/pld-builder-0.3.20090406.tar.bz2": 
http://carme.pld-linux.org/~glen/pld-builder-0.3.20090406.tar.bz2:
2009-04-06 16:53:16 ERROR 404: Not Found.
)

Files fetched: 0



-- 
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: iptables-batch.patch - updated

[arekm]

Author: arekmDate: Mon Apr  6 14:53:10 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated

 Files affected:
SOURCES:
   iptables-batch.patch (1.6 -> 1.7) 

 Diffs:


Index: SOURCES/iptables-batch.patch
diff -u SOURCES/iptables-batch.patch:1.6 SOURCES/iptables-batch.patch:1.7
--- SOURCES/iptables-batch.patch:1.6Fri Mar 27 00:37:43 2009
+++ SOURCES/iptables-batch.patchMon Apr  6 16:53:05 2009
@@ -580,13 +580,16 @@
  ip6tables_static_LDADD  = libiptc/libiptc.la extensions/libext6.a -lm
  
  bin_PROGRAMS = iptables-xml
-@@ -89,7 +99,8 @@
+@@ -104,10 +104,10 @@
  endif
  if ENABLE_SHARED
- sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save \
-- ip6tables ip6tables-multi ip6tables-restore ip6tables-save
-+ ip6tables ip6tables-multi ip6tables-restore ip6tables-save \
-+ iptables-batch ip6tables-batch
+ if ENABLE_IPV4
+-sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save
++sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save 
iptables-batch
+ endif
+ if ENABLE_IPV6
+-sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save
++sbin_PROGRAMS += ip6tables ip6tables-multi ip6tables-restore ip6tables-save 
ip6tables-batch
+ endif
  endif
  
- iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man 
extensions/targets4.man


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-batch.patch?r1=1.6&r2=1.7&f=u

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

SPECS: suspend.spec - rel 2 - added initrd package (built with dietlibc by ...

[baggins]

Author: baggins  Date: Mon Apr  6 14:49:37 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 2
- added initrd package (built with dietlibc by default)

 Files affected:
SPECS:
   suspend.spec (1.62 -> 1.63) 

 Diffs:


Index: SPECS/suspend.spec
diff -u SPECS/suspend.spec:1.62 SPECS/suspend.spec:1.63
--- SPECS/suspend.spec:1.62 Fri Apr  3 01:57:28 2009
+++ SPECS/suspend.spec  Mon Apr  6 16:49:31 2009
@@ -1,14 +1,22 @@
 # $Revision$, $Date$
 #
 %bcond_withsplashy
+%bcond_without initrd  # don't build resume-initrd
+%bcond_without dietlibc# link initrd version with static glibc
 #
+
+# no-can-link splashy with dietlibc
+%if %{with splashy}
+%undefine with_dietlibc
+%endif
+
 %definesnap20090403
 Summary:   Suspend to RAM/Disk/Both
 Summary(de.UTF-8): Einfrieren in den Systemspeicher
 Summary(pl.UTF-8): Zamrażanie w RAM/Dysku/Jedno i drugie
 Name:  suspend
 Version:   0.8
-Release:   0.%{snap}.1
+Release:   0.%{snap}.2
 License:   GPL v2
 Group: Applications/System
 # cvs -z3 -d:pserver:anonym...@suspend.cvs.sf.net:/cvsroot/suspend co suspend
@@ -16,9 +24,13 @@
 # Source0-md5: 91616804cabb90656daaed8a5cf1da20
 Patch0:%{name}-sys-file-range-write.patch
 Patch1:%{name}-fadvise.patch
+Patch2:%{name}-diet.patch
 URL:   http://sourceforge.net/projects/suspend
 BuildRequires: autoconf
 BuildRequires: automake
+%if %{with initrd}
+%{?with_dietlibc:BuildRequires:dietlibc-static}
+%endif
 BuildRequires: glibc-static
 BuildRequires: libgcrypt-static
 BuildRequires: libgpg-error-static
@@ -56,10 +68,35 @@
 Elementy przestrzeni użytkownika potrzebne do zamrażania stanu systemu
 na dysku lub w pamięci RAM pod Linuksem.
 
+%package initrd
+Summary:   Suspend to RAM/Disk/Both resume program for initrd
+Summary(pl.UTF-8): Zamrażanie w RAM/Dysku/Jedno i drugie - program resume 
dla initrd
+Group: Base
+
+%description initrd
+Suspend to RAM/Disk/Both resume program for initrd.
+
+%description initrd -l pl.UTF-8
+Zamrażanie w RAM/Dysku/Jedno i drugie - program resume dla initrd.
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p2
+%patch2 -p1
+
+cat >syscalltest.c <
+#include 
+int main() { printf("%d", SYS_reboot); return 0; }
+EOF
+gcc syscalltest.c -o syscalltest
+SYS_REBOOT_NR=`./syscalltest`
+
+sed -i -e "s/SYS_REBOOT_NR/$SYS_REBOOT_NR/" swsusp.h
+
+# I don't see any issue here (nor libgcc_s.a)
+%{?with_splashy:sed -i -e 's|AC_CHECK_LIB(\[gcc_s\], \[strlen\])||' 
configure.ac}
 
 %build
 %{__libtoolize}
@@ -68,10 +105,34 @@
 %{__autoconf}
 %{__automake}
 
+%if %{with initrd}
+%configure \
+   %{?with_dietlibc:CFLAGS="%{rpmcflags} -D_BSD_SOURCE -Os -static"} \
+   %{?with_dietlibc:CC="diet %{__cc}"} \
+   %{?with_splashy:--enable-splashy} \
+   --enable-compress \
+   --enable-encrypt \
+   --enable-static \
+   --disable-shared
+
+%if %{with dietlibc}
+%{__make} libsuspend-common.a resume-resume.o
+diet %{__cc} %{rpmcflags} %{rpmldflags} -D_BSD_SOURCE -Os -static \
+   -DS2RAM -D_LARGEFILE64_SOURCE -D_GNU_SOURCE \
+   -o resume resume-resume.o \
+   libsuspend-common.a -llzo2 -lgcrypt -lgpg-error -lcompat
+%else
+%{__make} resume
+%endif
+mv resume resume-initrd
+%{__make} clean
+%endif
+
 %configure \
%{?with_splashy:--enable-splashy} \
--enable-compress \
--enable-encrypt
+
 %{__make}
 
 %install
@@ -80,6 +141,11 @@
 %{__make} install \
DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install resume-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/resume
+%endif
+
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
@@ -93,12 +159,22 @@
 %attr(755,root,root) %{_libdir}/suspend/resume
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/suspend.conf
 
+%if %{with initrd}
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/initrd/resume
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team 
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.63  2009/04/06 14:49:31  baggins
+- rel 2
+- added initrd package (built with dietlibc by default)
+
 Revision 1.62  2009/04/02 23:57:28  glen
 - up to 20090403
 - needs 2.6.17 according to docs


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/suspend.spec?r1=1.62&r2=1.63&f=u

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

SOURCES: suspend-diet.patch (NEW) - fixes allowing building with dietlibc

[baggins]

Author: baggins  Date: Mon Apr  6 14:49:04 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- fixes allowing building with dietlibc

 Files affected:
SOURCES:
   suspend-diet.patch (NONE -> 1.1)  (NEW)

 Diffs:


Index: SOURCES/suspend-diet.patch
diff -u /dev/null SOURCES/suspend-diet.patch:1.1
--- /dev/null   Mon Apr  6 16:49:05 2009
+++ SOURCES/suspend-diet.patch  Mon Apr  6 16:48:59 2009
@@ -0,0 +1,95 @@
+diff -ur suspend/radeontool.c suspend-diet/radeontool.c
+--- suspend/radeontool.c   2007-09-13 21:38:10.0 +0200
 suspend-diet/radeontool.c  2009-04-06 15:09:50.0 +0200
+@@ -26,6 +26,9 @@
+ #include 
+ #include 
+ #include 
++#ifdef __dietlibc__
++#define PCI_HAVE_STDINT_H
++#endif
+ #include 
+ 
+ #define RADEON_LVDS_GEN_CNTL0x02d0
+diff -ur suspend/s2ram-x86.c suspend-diet/s2ram-x86.c
+--- suspend/s2ram-x86.c2008-11-03 16:12:53.0 +0100
 suspend-diet/s2ram-x86.c   2009-04-06 15:09:34.0 +0200
+@@ -15,6 +15,9 @@
+ #include 
+ #include 
+ 
++#ifdef __dietlibc__
++#define PCI_HAVE_STDINT_H
++#endif
+ #include 
+ 
+ #include "vbetool/vbetool.h"
+diff -ur suspend/suspend_ioctls.h suspend-diet/suspend_ioctls.h
+--- suspend/suspend_ioctls.h   2008-05-06 14:01:06.0 +0200
 suspend-diet/suspend_ioctls.h  2009-04-06 15:03:00.0 +0200
+@@ -8,7 +8,11 @@
+  */
+ struct resume_swap_area {
+   loff_t offset;
++#ifdef __dietlibc__
++  uint32_t dev;
++#else
+   u_int32_t dev;
++#endif
+ } __attribute__((packed));
+ 
+ #define SNAPSHOT_IOC_MAGIC'3'
+diff -ur suspend/swsusp.h suspend-diet/swsusp.h
+--- suspend/swsusp.h   2009-04-06 15:11:06.0 +0200
 suspend-diet/swsusp.h  2009-04-06 15:03:27.0 +0200
+@@ -115,6 +115,9 @@
+   return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_FINISH);
+ }
+ 
++#ifdef __dietlibc__
++#define SYS_reboot SYS_REBOOT_NR
++#endif
+ static inline void reboot(void)
+ {
+   syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
+diff -ur suspend/vbetool/vbetool.c suspend-diet/vbetool/vbetool.c
+--- suspend/vbetool/vbetool.c  2008-04-23 17:45:56.0 +0200
 suspend-diet/vbetool/vbetool.c 2009-04-06 15:10:05.0 +0200
+@@ -8,6 +8,9 @@
+ version 2
+ */
+ 
++#ifdef __dietlibc__
++#define PCI_HAVE_STDINT_H
++#endif
+ #include 
+ #include 
+ #include 
+--- suspend/load.c~2009-04-06 15:36:54.0 +0200
 suspend/load.c 2009-04-06 15:43:48.0 +0200
+@@ -135,10 +135,12 @@
+   memset(handle->extents + n, 0, sizeof(struct extent));
+   handle->cur_extent = handle->extents;
+   handle->cur_offset = handle->cur_extent->start;
++#ifndef __dietlibc__
+   if (posix_fadvise(handle->fd, handle->cur_offset,
+   handle->cur_extent->end - handle->cur_offset,
+   POSIX_FADV_NOREUSE))
+   perror("posix_fadvise");
++#endif
+   return 0;
+ }
+ 
+@@ -221,10 +223,12 @@
+   handle->cur_extent++;
+   if (handle->cur_extent->start < handle->cur_extent->end) {
+   handle->cur_offset = handle->cur_extent->start;
++#ifndef __dietlibc__
+   if (posix_fadvise(handle->fd, handle->cur_offset,
+   handle->cur_extent->end - handle->cur_offset,
+   POSIX_FADV_NOREUSE))
+   perror("posix_fadvise");
++#endif
+   return;
+   }
+   /* No more extents.  Load the next extents page. */

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

PLDWWW: Machines/ymir

[arekm]

Author: arekm   Date: Mon Apr  6 13:02:38 2009 GMT
Module: PLDWWW   URL: http://www.pld-linux.org/Machines/ymir
 Log message:


 Page affected: Machines/ymir

 Diffs:


New page:
= Information about ymir.pld-linux.org =

 * Admin contact: Arkadiusz Miśkiewicz 
 * Hardware: SR1560 
([http://support.intel.com/support/motherboards/server/s5400SF/index.htm 
S5400SF] mainboard in 1U chassis)
 * Architecture: x86_64
 * Access: restricted
 * Processor: 2 x Quad Core Intel(R) Xeon(TM) Unknown GHz
 * Memory: 4G [http://en.wikipedia.org/wiki/FB-DIMM FB-DIMM]
 * Disk space: unknown (3 x SAS bays)
 * Network: bandwidth 10Mbps
 * Status: offline, assembling hardware
 * Description:
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: texlive.spec - dirs-fonts P: tetex-dirs-fonts

[pawelz]

Author: pawelz   Date: Mon Apr  6 14:00:13 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- dirs-fonts P: tetex-dirs-fonts

 Files affected:
SPECS:
   texlive.spec (1.212 -> 1.213) 

 Diffs:


Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.212 SPECS/texlive.spec:1.213
--- SPECS/texlive.spec:1.212Mon Apr  6 15:49:23 2009
+++ SPECS/texlive.spec  Mon Apr  6 16:00:07 2009
@@ -4266,6 +4266,7 @@
 Summary(pl.UTF-8): Katalogi fontów TeXa
 Group: Fonts
 Obsoletes: tetex-dirs-fonts
+Provides:  tetex-dirs-fonts
 
 %description dirs-fonts
 TeX font directories.
@@ -13642,6 +13643,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.213  2009/04/06 14:00:07  pawelz
+- dirs-fonts P: tetex-dirs-fonts
+
 Revision 1.212  2009/04/06 13:49:23  pawelz
 - cslatex O/P: tetex-cslatex
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.212&r2=1.213&f=u

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

PLDWWW: Donations/Hardware

[arekm]

Author: arekm   Date: Mon Apr  6 12:59:52 2009 GMT
Module: PLDWWW   URL: 
http://www.pld-linux.org/Donations/Hardware?action=diff&rev2=62&rev1=61
 Log message:


 Page affected: Donations/Hardware

 Diffs:


  
  Here is the list of the hardware we need:
  
+ [wiki:Machines/ymir ymir.pld-linux.org] (priority)
+ 
+   * 4GB of FB-DIMM memory (cost ~500PLN including VAT)
+ 
+ Collected so far: 200PLN
+ 
  [wiki:Machines/carme carme.pld-linux.org]
  
* 6GB of FB-DIMM memory (cost ~700PLN including VAT)
+ 
+ Collected so far: 0PLN
  
  Contact information:
Arkadiusz Miśkiewicz
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: splashy.spec - rel 3 - added static subpackage

[baggins]

Author: baggins  Date: Mon Apr  6 13:51:05 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 3
- added static subpackage

 Files affected:
SPECS:
   splashy.spec (1.21 -> 1.22) 

 Diffs:


Index: SPECS/splashy.spec
diff -u SPECS/splashy.spec:1.21 SPECS/splashy.spec:1.22
--- SPECS/splashy.spec:1.21 Fri Feb 27 02:10:58 2009
+++ SPECS/splashy.spec  Mon Apr  6 15:51:00 2009
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8): System ekranu startowego nowej generacji
 Name:  splashy
 Version:   0.3.13
-Release:   2
+Release:   3
 License:   GPL v2
 Group: Applications/System
 Source0:   
http://alioth.debian.org/frs/download.php/2691/%{name}_%{version}.tar.gz
@@ -111,6 +111,18 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek Splashy.
 
+%package static
+Summary:   Static Splashy libraries
+Summary(pl.UTF-8): Statyczne biblioteki Splashy
+Group: Development/Libraries
+Requires:  %{name}-devel = %{version}-%{release}
+
+%description static
+Static Splashy libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Splashy.
+
 %package theme-default
 Summary:   Default theme for splashy
 Summary(pl.UTF-8): Domyślny motyw dla systemu splashy
@@ -147,7 +159,10 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+
+%configure \
+   --enable-static
+
 %{__make} -j1
 
 %install
@@ -190,6 +205,10 @@
 %{_includedir}/splashy*.h
 %{_pkgconfigdir}/splashy.pc
 
+%files static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.a
+
 %files theme-default
 %defattr(644,root,root,755)
 %{_datadir}/splashy/themes/default
@@ -207,6 +226,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.22  2009/04/06 13:51:00  baggins
+- rel 3
+- added static subpackage
+
 Revision 1.21  2009/02/27 01:10:58  baggins
 - rel 2
 - package properly initramfs-tools stuff and move it to separate package


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/splashy.spec?r1=1.21&r2=1.22&f=u

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

SPECS: texlive.spec - cslatex O/P: tetex-cslatex

[pawelz]

Author: pawelz   Date: Mon Apr  6 13:49:28 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- cslatex O/P: tetex-cslatex

 Files affected:
SPECS:
   texlive.spec (1.211 -> 1.212) 

 Diffs:


Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.211 SPECS/texlive.spec:1.212
--- SPECS/texlive.spec:1.211Fri Apr  3 16:52:29 2009
+++ SPECS/texlive.spec  Mon Apr  6 15:49:23 2009
@@ -1608,6 +1608,8 @@
 Requires(post,postun): %{_bindir}/texhash
 Requires:  %{name}-fonts-cs = %{epoch}:%{version}-%{release}
 Requires:  %{name}-plain = %{epoch}:%{version}-%{release}
+Obsoletes: tetex-cslatex
+Provides:  tetex-cslatex
 
 %description cslatex
 CSLaTeX format basic files.
@@ -13640,6 +13642,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.212  2009/04/06 13:49:23  pawelz
+- cslatex O/P: tetex-cslatex
+
 Revision 1.211  2009/04/03 14:52:29  uzsolt
 - %%dir fixes
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.211&r2=1.212&f=u

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

SPECS: trac-plugin-ticketchange.spec - release 1

[glen]

Author: glen Date: Mon Apr  6 13:40:00 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 1

 Files affected:
SPECS:
   trac-plugin-ticketchange.spec (1.2 -> 1.3) 

 Diffs:


Index: SPECS/trac-plugin-ticketchange.spec
diff -u SPECS/trac-plugin-ticketchange.spec:1.2 
SPECS/trac-plugin-ticketchange.spec:1.3
--- SPECS/trac-plugin-ticketchange.spec:1.2 Mon Nov 24 13:54:12 2008
+++ SPECS/trac-plugin-ticketchange.spec Mon Apr  6 15:39:55 2009
@@ -3,7 +3,7 @@
 Summary:   Ticket Comments Change Plugin
 Name:  trac-plugin-ticketchange
 Version:   0
-Release:   0.2
+Release:   1
 License:   BSD-like
 Group: Applications/WWW
 # Source0Download: 
http://trac-hacks.org/changeset/latest/ticketchangeplugin?old_path=/&filename=ticketchangeplugin&format=zip
@@ -62,6 +62,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.3  2009/04/06 13:39:55  glen
+- release 1
+
 Revision 1.2  2008/11/24 12:54:12  glen
 - include trac.ini change help
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/trac-plugin-ticketchange.spec?r1=1.2&r2=1.3&f=u

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

SPECS: trac-plugin-ticketdelete.spec - release 1

[glen]

Author: glen Date: Mon Apr  6 13:35:27 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- release 1

 Files affected:
SPECS:
   trac-plugin-ticketdelete.spec (1.2 -> 1.3) 

 Diffs:


Index: SPECS/trac-plugin-ticketdelete.spec
diff -u SPECS/trac-plugin-ticketdelete.spec:1.2 
SPECS/trac-plugin-ticketdelete.spec:1.3
--- SPECS/trac-plugin-ticketdelete.spec:1.2 Mon Nov 24 13:54:12 2008
+++ SPECS/trac-plugin-ticketdelete.spec Mon Apr  6 15:35:21 2009
@@ -3,7 +3,7 @@
 Summary:   Ticket and Ticket Change Deletion Plugin
 Name:  trac-plugin-ticketdelete
 Version:   0
-Release:   0.1
+Release:   1
 License:   BSD-like
 Group: Applications/WWW
 # Source0Download: 
http://trac-hacks.org/changeset/latest/ticketdeleteplugin?old_path=/&filename=ticketdeleteplugin&format=zip
@@ -66,6 +66,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.3  2009/04/06 13:35:21  glen
+- release 1
+
 Revision 1.2  2008/11/24 12:54:12  glen
 - include trac.ini change help
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/trac-plugin-ticketdelete.spec?r1=1.2&r2=1.3&f=u

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

SVN: geninitrd/trunk/mod-uvesafb.sh

[glen]

Author: glen
Date: Mon Apr  6 15:24:59 2009
New Revision: 10311

Modified:
   geninitrd/trunk/mod-uvesafb.sh
Log:
- find v86d from initrd dir

Modified: geninitrd/trunk/mod-uvesafb.sh
==
--- geninitrd/trunk/mod-uvesafb.sh  (original)
+++ geninitrd/trunk/mod-uvesafb.sh  Mon Apr  6 15:24:59 2009
@@ -5,9 +5,24 @@
 # whether v86d should be installed
 need_uvesafb=no
 
+# setup geninitrd module
+# @access  public
+setup_mod_uvesafb() {
+   v86d=$(find_tool $initrd_dir/v86d /sbin/v86d)
+   if [ -x "$v86d" ]; then
+   USE_V86D=yes
+   else
+   USE_V86D=no
+   fi
+}
+
 # find modules for for fbsplash
 # @access  public
 find_modules_uvesafb() {
+   if ! is_yes "$USE_V86D"; then
+   return
+   fi
+
# if we are adding uvesafb, we need v86d as well
local m
for m in $MODULES; do
@@ -28,5 +43,5 @@
mknod $DESTDIR/dev/mem c 1 1
mknod $DESTDIR/dev/tty1 c 4 1
inst_d /sbin
-   inst_exec /sbin/v86d /sbin
+   inst_exec $v86d /sbin
 }
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SPECS: v86d.spec - rel 3 - renamed bcond klibc -> initrd - build initrd sub...

[baggins]

Author: baggins  Date: Mon Apr  6 12:42:09 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 3
- renamed bcond klibc -> initrd
- build initrd subpackage

 Files affected:
SPECS:
   v86d.spec (1.21 -> 1.22) 

 Diffs:


Index: SPECS/v86d.spec
diff -u SPECS/v86d.spec:1.21 SPECS/v86d.spec:1.22
--- SPECS/v86d.spec:1.21Sat Nov 15 08:40:15 2008
+++ SPECS/v86d.spec Mon Apr  6 14:42:03 2009
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_withx86emu  # x86emu instead of LRMI/vm86
-%bcond_withklibc   # use klibc for initramfs purposes
+%bcond_without initrd  # don't build klibc based helper for initrd/initramfs
 #
 %ifnarch %{ix86}
 %definewith_x86emu 1
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8): Program pomocniczy uvesafb uruchamiający kod x86 w 
emulowanym środowisku
 Name:  v86d
 Version:   0.1.9
-Release:   2
+Release:   3
 License:   GPL v2
 Group: Applications/System
 Source0:   
http://dev.gentoo.org/~spock/projects/uvesafb/archive/%{name}-%{version}.tar.bz2
@@ -22,19 +22,18 @@
 Patch2:%{name}-klibc-ldflags.patch
 URL:   http://dev.gentoo.org/~spock/projects/uvesafb/
 BuildRequires: linux-libc-headers >= 7:2.6.24
-%if %{with klibc}
+%if %{with initrd}
 BuildRequires: klibc-static >= 1.5.8-1
-%if %{with x86emu}
-BuildRequires: x86emu-devel(klibc)
+   %if %{with x86emu}
+BuildRequires: x86emu-klibc-devel
+   %else
+BuildRequires: lrmi-klibc-devel >= 0.10-6
+   %endif
 %endif
-%else
 %if %{with x86emu}
 BuildRequires: x86emu-devel
 %else
 BuildRequires: lrmi-devel >= 0.10-4
-%endif
-%endif
-%if %{without x86emu}
 Requires:  lrmi >= 0.10-4
 %endif
 ExclusiveArch: %{ix86} %{x8664}
@@ -52,6 +51,19 @@
 uruchamiający kod x86. Jest wykorzystywany przez sterownik jądra
 Linuksa uvesafb. Obecnie obsługuje architektury x86 i x86-64.
 
+%package initrd
+Summary:   uvesafb userspace helper that runs x86 code in an emulated 
environment - initrd version
+Summary(pl.UTF-8): Program pomocniczy uvesafb uruchamiający kod x86 w 
emulowanym środowisku - wersja dla initrd
+Group: Base
+
+%description initrd
+uvesafb userspace helper that runs x86 code in an emulated environment
+- initrd version
+
+%description initrd -l pl.UTF-8
+Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku
+- wersja dla initrd
+
 %prep
 %setup -q
 %patch0 -p1
@@ -60,18 +72,29 @@
 %patch2 -p1
 
 %build
+%if %{with initrd}
 # not ac
 ./configure \
-   --with%{!?with_klibc:out}-klibc \
+   --with-klibc \
--with%{!?with_x86emu:out}-x86emu
 
 %{__make} \
-%if %{with klibc}
LIB=%{_lib} \
-%else
-   CC="%{__cc}" \
+   CFLAGS="%{rpmcflags} -Os %{!?with_x86emu:-I/usr/include/klibc/lrmi}"
+
+mkdir -p initrd
+cp v86d initrd/
+%{__make} clean
 %endif
-   OPTFLAGS="%{rpmcflags}%{!?with_x86emu: -I/usr/include/lrmi}"
+
+# not ac
+./configure \
+   --without-klibc \
+   --with%{!?with_x86emu:out}-x86emu
+
+%{__make} \
+   CC="%{__cc}" \
+   OPTFLAGS="%{rpmcflags} %{!?with_x86emu:-I/usr/include/lrmi}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +103,11 @@
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/uvesafb.conf
 
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd/%{name} $RPM_BUILD_ROOT%{_libdir}/initrd
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,12 +117,23 @@
 %attr(755,root,root) %{_sbindir}/v86d
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/uvesafb.conf
 
+%if %{with initrd}
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/initrd/v86d
+%endif
+
 %define date%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team 
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.22  2009/04/06 12:42:03  baggins
+- rel 3
+- renamed bcond klibc -> initrd
+- build initrd subpackage
+
 Revision 1.21  2008/11/15 07:40:15  qboosh
 - updated klibc-ldflags patch not to break on multilib systems
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/v86d.spec?r1=1.21&r2=1.22&f=u

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

SPECS: lrmi.spec - rel 6 - wrong lib packaged for klibc

[baggins]

Author: baggins  Date: Mon Apr  6 12:34:03 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 6
- wrong lib packaged for klibc

 Files affected:
SPECS:
   lrmi.spec (1.11 -> 1.12) 

 Diffs:


Index: SPECS/lrmi.spec
diff -u SPECS/lrmi.spec:1.11 SPECS/lrmi.spec:1.12
--- SPECS/lrmi.spec:1.11Mon Apr  6 14:20:11 2009
+++ SPECS/lrmi.spec Mon Apr  6 14:33:57 2009
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8): Biblioteka do wywoływania funkcji BIOS w trybie 
rzeczywistym pod Linuksem
 Name:  lrmi
 Version:   0.10
-Release:   5
+Release:   6
 License:   BSD-like/Public Domain (see source)
 Group: Libraries
 Source0:   http://dl.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@
 
 %if %{with klibc}
 install -d $RPM_BUILD_ROOT{%{_klibdir},%{_kincludedir}/%{name}}
-install *.a $RPM_BUILD_ROOT%{_klibdir}
+install klibc/*.a $RPM_BUILD_ROOT%{_klibdir}
 install vbe.h lrmi.h $RPM_BUILD_ROOT%{_kincludedir}/%{name}
 %endif
 
@@ -135,6 +135,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.12  2009/04/06 12:33:57  baggins
+- rel 6
+- wrong lib packaged for klibc
+
 Revision 1.11  2009/04/06 12:20:11  baggins
 - rel 5
 - added klibc-devel subpackage


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lrmi.spec?r1=1.11&r2=1.12&f=u

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

SPECS: lrmi.spec - rel 5 - added klibc-devel subpackage

[baggins]

Author: baggins  Date: Mon Apr  6 12:20:16 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 5
- added klibc-devel subpackage

 Files affected:
SPECS:
   lrmi.spec (1.10 -> 1.11) 

 Diffs:


Index: SPECS/lrmi.spec
diff -u SPECS/lrmi.spec:1.10 SPECS/lrmi.spec:1.11
--- SPECS/lrmi.spec:1.10Sat Nov  1 11:10:05 2008
+++ SPECS/lrmi.spec Mon Apr  6 14:20:11 2009
@@ -1,18 +1,28 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without klibc   # use klibc for initrd/initramfs purposes
+#
 Summary:   Library for calling real mode BIOS routines under Linux
 Summary(pl.UTF-8): Biblioteka do wywoływania funkcji BIOS w trybie 
rzeczywistym pod Linuksem
 Name:  lrmi
 Version:   0.10
-Release:   4
+Release:   5
 License:   BSD-like/Public Domain (see source)
 Group: Libraries
 Source0:   http://dl.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
 # Source0-md5: fc1d9495e8f4563fca471bb65f34a5da
 Patch0:%{name}-update-v86d.patch
 URL:   http://sourceforge.net/projects/lrmi/
+%{?with_klibc:BuildRequires:   klibc-devel}
 ExclusiveArch: %{ix86}
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{with klibc}
+%define_klibdir%{_prefix}/%{_lib}/klibc
+%define_kincludedir%{_prefix}/include/klibc
+%endif
+
 %description
 LRMI is a library for calling real mode BIOS routines under Linux.
 
@@ -44,11 +54,33 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka lrmi.
 
+%package klibc-devel
+Summary:   Header files and static lrmi library for klibc
+Summary(pl.UTF-8): Pliki nagłówkowe i statyczna biblioteka lrmi dla klibc
+Group: Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+
+%description klibc-devel
+Header files and static lrmi library for klibc.
+
+%description klibc-devel -l pl.UTF-8
+Pliki nagłówkowe i statyczna biblioteka lrmi dla klibc.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
+%if %{with klibc}
+%{__make} liblrmi.a \
+   CC="klcc" \
+   CFLAGS="%{rpmcflags} -Os -static -Wall"
+
+mkdir -p klibc
+cp liblrmi.a klibc/
+%{__make} clean
+%endif
+
 %{__make} \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -Wall"
@@ -65,6 +97,12 @@
 install *.so *.a $RPM_BUILD_ROOT%{_libdir}
 install vbe.h lrmi.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
+%if %{with klibc}
+install -d $RPM_BUILD_ROOT{%{_klibdir},%{_kincludedir}/%{name}}
+install *.a $RPM_BUILD_ROOT%{_klibdir}
+install vbe.h lrmi.h $RPM_BUILD_ROOT%{_kincludedir}/%{name}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,12 +122,23 @@
 %defattr(644,root,root,755)
 %{_libdir}/liblrmi.a
 
+%if %{with klibc}
+%files klibc-devel
+%defattr(644,root,root,755)
+%{_kincludedir}/%{name}
+%{_klibdir}/liblrmi.a
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team 
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.11  2009/04/06 12:20:11  baggins
+- rel 5
+- added klibc-devel subpackage
+
 Revision 1.10  2008/11/01 10:10:05  qboosh
 - updated update-v86d patch (from v86d 0.1.9)
 - release 4


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lrmi.spec?r1=1.10&r2=1.11&f=u

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

SPECS: ghostscript.spec - one more security blocker added

[blues]

Author: bluesDate: Mon Apr  6 11:57:25 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- one more security blocker added

 Files affected:
SPECS:
   ghostscript.spec (1.179 -> 1.180) 

 Diffs:


Index: SPECS/ghostscript.spec
diff -u SPECS/ghostscript.spec:1.179 SPECS/ghostscript.spec:1.180
--- SPECS/ghostscript.spec:1.179Mon Mar 30 22:51:20 2009
+++ SPECS/ghostscript.spec  Mon Apr  6 13:57:19 2009
@@ -41,6 +41,8 @@
 BuildRequires: security(CVE-2009-0583)
 BuildRequires: security(CVE-2009-0584)
 ##
+# http://bugs.ghostscript.com/show_bug.cgi?id=690211
+BuildRequires: security(690211)
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: docbook-style-dsssl
@@ -337,6 +339,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.180  2009/04/06 11:57:19  blues
+- one more security blocker added
+
 Revision 1.179  2009/03/30 20:51:20  qboosh
 - pl for -cups
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ghostscript.spec?r1=1.179&r2=1.180&f=u

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

SPECS: x86emu.spec - cosmetics

[baggins]

Author: baggins  Date: Mon Apr  6 11:56:49 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- cosmetics

 Files affected:
SPECS:
   x86emu.spec (1.8 -> 1.9) 

 Diffs:


Index: SPECS/x86emu.spec
diff -u SPECS/x86emu.spec:1.8 SPECS/x86emu.spec:1.9
--- SPECS/x86emu.spec:1.8   Mon Apr  6 13:55:19 2009
+++ SPECS/x86emu.spec   Mon Apr  6 13:56:44 2009
@@ -21,7 +21,7 @@
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with klibc}
-%define_klibdir%{_prefix}/%{_lib}/klibc
+%define_klibdir%{_prefix}/%{_lib}/klibc
 %define_kincludedir%{_prefix}/include/klibc
 %endif
 
@@ -142,6 +142,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.9  2009/04/06 11:56:44  baggins
+- cosmetics
+
 Revision 1.8  2009/04/06 11:55:19  baggins
 - rel 4
 - klibc-devel subpackage instead of a lot of hacks


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/x86emu.spec?r1=1.8&r2=1.9&f=u

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

SPECS: x86emu.spec - rel 4 - klibc-devel subpackage instead of a lot of hacks

[baggins]

Author: baggins  Date: Mon Apr  6 11:55:24 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- rel 4
- klibc-devel subpackage instead of a lot of hacks

 Files affected:
SPECS:
   x86emu.spec (1.7 -> 1.8) 

 Diffs:


Index: SPECS/x86emu.spec
diff -u SPECS/x86emu.spec:1.7 SPECS/x86emu.spec:1.8
--- SPECS/x86emu.spec:1.7   Sat Nov 15 08:27:19 2008
+++ SPECS/x86emu.spec   Mon Apr  6 13:55:19 2009
@@ -1,13 +1,13 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_withklibc   # use klibc for initramfs purposes
+%bcond_without klibc   # use klibc for initrd/initramfs purposes
 #
 Summary:   Intel x86 CPU real mode emulator
 Summary(pl.UTF-8): Emulator trybu rzeczywistego procesorów Intel x86
 Name:  x86emu
 Version:   0.8
-Release:   3
+Release:   4
 License:   MIT
 Group: Libraries
 Source0:   
http://www.scitechsoft.com/ftp/devel/obsolete/x86emu/%{name}-%{version}.tar.gz
@@ -21,8 +21,8 @@
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with klibc}
-%define_libdir %{_prefix}/%{_lib}/klibc
-%define_includedir %{_prefix}/include/klibc
+%define_klibdir%{_prefix}/%{_lib}/klibc
+%define_kincludedir%{_prefix}/include/klibc
 %endif
 
 %description
@@ -52,9 +52,6 @@
 Summary:   Header files and static x86emu library
 Summary(pl.UTF-8): Pliki nagłówkowe i biblioteka statyczna x86emu
 Group: Development/Libraries
-%if %{with klibc}
-Provides:  %{name}-devel(klibc) = %{version}-%{release}
-%endif
 
 %description devel
 Header files and static x86emu library.
@@ -62,6 +59,17 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe i biblioteka statyczna x86emu.
 
+%package klibc-devel
+Summary:   Header files and static x86emu library for klibc
+Summary(pl.UTF-8): Pliki nagłówkowe i biblioteka statyczna x86emu dla klibc
+Group: Development/Libraries
+
+%description klibc-devel
+Header files and static x86emu library for klibc.
+
+%description klibc-devel -l pl.UTF-8
+Pliki nagłówkowe i biblioteka statyczna x86emu dla klibc.
+
 %prep
 %setup -q -c
 %patch0 -p1
@@ -72,8 +80,13 @@
 %build
 %if %{with klibc}
 %{__make} -C scitech/src/x86emu -f makefile.klibc \
-   OPT="%{rpmcflags}"
-%else # klibc
+   OPT="%{rpmcflags} -Os"
+
+mkdir -p klibc
+cp scitech/src/x86emu/libx86emu*.a klibc/
+%{__make} -C scitech/src/x86emu -f makefile.klibc clean
+%endif
+
 %{__make} -C scitech/src/x86emu -f makefile.linux \
CC="%{__cc}" \
OPT="%{rpmcflags}"
@@ -85,7 +98,6 @@
CC="%{__cc}" \
OPT="%{rpmcflags}"
 %endif
-%endif # klibc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +107,13 @@
 install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_includedir}/x86emu.h
 cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_includedir}/x86emu
 
+%if %{with klibc}
+install -d $RPM_BUILD_ROOT{%{_klibdir},%{_kincludedir}}
+install klibc/libx86emu*.a $RPM_BUILD_ROOT%{_klibdir}
+install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_kincludedir}/x86emu.h
+cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_kincludedir}/x86emu
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,16 +123,29 @@
 %defattr(644,root,root,755)
 %doc scitech/src/x86emu/LICENSE
 %{_libdir}/libx86emu.a
-%{!?with_klibc:%{_libdir}/libx86emud.a}
+%{_libdir}/libx86emud.a
 %{_includedir}/x86emu.h
 %{_includedir}/x86emu
 
+%if %{with klibc}
+%files klibc-devel
+%defattr(644,root,root,755)
+%doc scitech/src/x86emu/LICENSE
+%{_klibdir}/libx86emu.a
+%{_kincludedir}/x86emu.h
+%{_kincludedir}/x86emu
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team 
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.8  2009/04/06 11:55:19  baggins
+- rel 4
+- klibc-devel subpackage instead of a lot of hacks
+
 Revision 1.7  2008/11/15 07:27:19  qboosh
 - simplified klibc bcond by redefining dir macros
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/x86emu.spec?r1=1.7&r2=1.8&f=u

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

SPECS: asterisk.spec - one more CVE blocker - is asterisk in PLD still main...

[blues]

Author: bluesDate: Mon Apr  6 11:55:15 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- one more CVE blocker - is asterisk in PLD still maintained?

 Files affected:
SPECS:
   asterisk.spec (1.130 -> 1.131) 

 Diffs:


Index: SPECS/asterisk.spec
diff -u SPECS/asterisk.spec:1.130 SPECS/asterisk.spec:1.131
--- SPECS/asterisk.spec:1.130   Tue Mar 17 13:12:45 2009
+++ SPECS/asterisk.spec Mon Apr  6 13:55:10 2009
@@ -58,6 +58,9 @@
 # http://downloads.digium.com/pub/security/AST-2009-002.html
 # Upgrade to 1.6.0.6:
 BuildRequires: security(CVE-2009-0871)
+#  http://downloads.digium.com/pub/security/AST-2009-003.html
+# Upgrade to 1.6.0.8:
+BuildRequires: security(CVE-2008-3903)
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -330,6 +333,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.131  2009/04/06 11:55:10  blues
+- one more CVE blocker - is asterisk in PLD still maintained?
+
 Revision 1.130  2009/03/17 12:12:45  blues
 - one more secuiruty blocker (CVE-2009-0871)
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/asterisk.spec?r1=1.130&r2=1.131&f=u

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

SPECS: bugzilla.spec - security blocker

[blues]

Author: bluesDate: Mon Apr  6 11:53:23 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- security blocker

 Files affected:
SPECS:
   bugzilla.spec (1.36 -> 1.37) 

 Diffs:


Index: SPECS/bugzilla.spec
diff -u SPECS/bugzilla.spec:1.36 SPECS/bugzilla.spec:1.37
--- SPECS/bugzilla.spec:1.36Wed Mar 18 17:03:33 2009
+++ SPECS/bugzilla.spec Mon Apr  6 13:53:18 2009
@@ -19,6 +19,8 @@
 Source4:   %{name}.cron
 Patch0:%{name}-pld.patch
 URL:   http://www.bugzilla.org/
+# http://www.bugzilla.org/security/3.2.2/
+BuildRequires: security(3.2.2)
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -176,6 +178,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.37  2009/04/06 11:53:18  blues
+- security blocker
+
 Revision 1.36  2009/03/18 16:03:33  duddits
 - up to 3.3.3
 - resolves: CVE-2009-0481, CVE-2009-0482, CVE-2009-0483,


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bugzilla.spec?r1=1.36&r2=1.37&f=u

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

SPECS: java-puretls.spec - disable test that requires java-sun - jdk bconds...

[pawelz]

Author: pawelz   Date: Mon Apr  6 11:52:10 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- disable test that requires java-sun
- jdk bconds
- rel 2

 Files affected:
SPECS:
   java-puretls.spec (1.17 -> 1.18) 

 Diffs:


Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.17 SPECS/java-puretls.spec:1.18
--- SPECS/java-puretls.spec:1.17Mon Apr  6 12:40:14 2009
+++ SPECS/java-puretls.spec Mon Apr  6 13:52:05 2009
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
-# TODO:
-# - It uses sun's proprietari API provided by rt.jar from J2SE, so I have no 
idea
-#   how to build it using gcj.
-#   note this warning: [javac] 
/home/users/pawelz/rpm/BUILD.noarch-linux/puretls-0.9b5/src/COM/claymoresystems/provider/test/DSATest.java:51:
 warning: sun.security.provider.DSAPublicKey is Sun proprietary API and may be 
removed in a future release
 
 %bcond_without javadoc # don't build javadoc
 
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun# build with gcj
+%else
+%bcond_withjava_sun# build with java-sun
+%endif
+
 %include   /usr/lib/rpm/macros.java
 
 %definesrcname puretls
@@ -14,7 +16,7 @@
 Summary(pl.UTF-8): Implementacja SSLv3 i TLSv1 w Javie
 Name:  java-puretls
 Version:   0.9
-Release:   0.%{beta}.1
+Release:   0.%{beta}.2
 License:   BSD-like
 Group: Libraries/Java
 Source0:   %{srcname}-%{version}%{beta}.tar.gz
@@ -23,8 +25,10 @@
 BuildRequires: ant
 BuildRequires: java-cryptix >= 3.2.0
 BuildRequires: java-cryptix-asn1 = 0.2009
-BuildRequires: java-sun
+%{!?with_java_sun:BuildRequires:   java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:java-sun}
 BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: sed >= 4.0
 %if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -32,7 +36,6 @@
 %endif
 Requires:  cryptix >= 3.2.0
 Requires:  cryptix-asn1 = 0.2009
-Requires:  java-sun-jre
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,6 +75,11 @@
xargs grep -l "/usr/local/bin/perl" | \
xargs sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|g;"
 
+# Disable test that uses proprietary SUN API
+%if %{without java_sun}
+mv src/COM/claymoresystems/provider/test/DSATest.java{,.disabled}
+%endif
+
 %build
 required_jars="cryptix cryptix-asn1"
 CLASSPATH=$(build-classpath $required_jars)
@@ -128,6 +136,11 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.18  2009/04/06 11:52:05  pawelz
+- disable test that requires java-sun
+- jdk bconds
+- rel 2
+
 Revision 1.17  2009/04/06 10:40:14  pawelz
 - one more %%install fix
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.17&r2=1.18&f=u

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

SPECS: wireshark.spec - security blocker

[blues]

Author: bluesDate: Mon Apr  6 11:50:39 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- security blocker

 Files affected:
SPECS:
   wireshark.spec (1.202 -> 1.203) 

 Diffs:


Index: SPECS/wireshark.spec
diff -u SPECS/wireshark.spec:1.202 SPECS/wireshark.spec:1.203
--- SPECS/wireshark.spec:1.202  Mon Feb 16 10:26:47 2009
+++ SPECS/wireshark.specMon Apr  6 13:50:33 2009
@@ -24,6 +24,8 @@
 Patch1:%{name}-as_needed.patch
 Patch2:%{name}-Werror.patch
 URL:   http://www.wireshark.org/
+# http://milw0rm.com/exploits/8308:
+BuildRequires: security(milw0rm.com/exploits/8308)
 BuildRequires: adns-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -328,6 +330,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.203  2009/04/06 11:50:33  blues
+- security blocker
+
 Revision 1.202  2009/02/16 09:26:47  blues
 - security note
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wireshark.spec?r1=1.202&r2=1.203&f=u

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

SOURCES: pci.ids - updated

[arekm]

Author: arekmDate: Mon Apr  6 10:59:58 2009 GMT
Module: SOURCES   Tag: HEAD
 Log message:
- updated

 Files affected:
SOURCES:
   pci.ids (1.32 -> 1.33) 

 Diffs:


Index: SOURCES/pci.ids
diff -u SOURCES/pci.ids:1.32 SOURCES/pci.ids:1.33
--- SOURCES/pci.ids:1.32Wed Feb 25 22:35:57 2009
+++ SOURCES/pci.ids Mon Apr  6 12:59:52 2009
@@ -1,8 +1,8 @@
 #
 #  List of PCI ID's
 #
-#  Version: 2009.02.20
-#  Date:2009-02-20 03:15:01
+#  Version: 2009.03.29
+#  Date:2009-03-29 03:15:02
 #
 #  Maintained by Martin Mares  and other volunteers from the
 #  PCI ID Project at http://pciids.sf.net/.
@@ -71,6 +71,7 @@
 02ac  SpeedStream
1012  1012 PCMCIA 10/100 Ethernet Card [RTL81xx]
 02e0  XFX Pine Group Inc
+0303  Hewlett-Packard Company (Wrong ID)
 0315  SK-Electronics Co., Ltd.
 0357  TTTech AG
000a  TTP-Monitoring Card V2.0
@@ -656,6 +657,7 @@
1734 10b8  Realtek High Definition Audio
4380  SB600 Non-Raid-5 SATA
103c 2813  DC5750 Microtower
+   1458 b005  Gigabyte GA-MA69G-S3H Motherboard
1462 7327  K9AG Neo2
17f2 5999  KI690-AM2 Motherboard
4381  SB600 Raid-5 SATA
@@ -694,6 +696,7 @@
17f2 5000  KI690-AM2 Motherboard
438c  SB600 IDE
103c 280a  DC5750 Microtower
+   1458 5002  Gigabyte GA-MA69G-S3H Motherboard
1462 7368  K9AG Neo2
17f2 5000  KI690-AM2 Motherboard
438d  SB600 PCI to LPC Bridge
@@ -1031,7 +1034,7 @@
 # The IBM card doubles as an ATI PCI video adapter
1014 029a  Remote Supervisor Adapter II (RSA2)
1014 02c8  eServer xSeries server mainboard
-   1028 016c  PowerEdge 1850
+   1028 016c  PowerEdge 1850 Embedded Radeon 7000/VE
1028 016d  PowerEdge 2850 Embedded Radeon 7000-M
1028 0170  PowerEdge 6850 Embedded Radeon 7000/VE
1028 019a  PowerEdge SC1425
@@ -1550,6 +1553,7 @@
95c6  RV620 LE AGP [Radeon HD 3450]
95c9  RV620 PCI [Radeon HD 3450]
95cc  RV620 [ATI FireGL V3700]
+   95cd  RV620 [FireMV 2450]
95ce  RV620 [FirePro 2260]
95cf  RV620 [FirePro 2260]
960f  RS780 Azalia controller
@@ -2434,8 +2438,13 @@
102b 1030  Parhelia 256 MB Dual DVI
102b 14e1  Parhelia PCI 256MB
102b 2021  QID Pro
+   0530  MGA G200EV
0532  MGA G200eW WPCM450
+   1028 0235  PowerEdge R710 MGA G200eW WPCM450
+   1028 0236  PowerEdge R610 MGA G200eW WPCM450
+   1028 0237  PowerEdge T610 MGA G200eW WPCM450
1028 0287  PowerEdge M610 MGA G200eW WPCM450
+   1028 029c  PowerEdge M710 MGA G200eW WPCM450
0540  M91XX
102b 2080  M9140 LP PCIe x16
102b 2100  M9120 PCIe x16
@@ -2712,7 +2721,6 @@
1019 0970  P6STP-FL motherboard
1043 8035  CUSI-FX motherboard
6306  530/620 PCI/AGP VGA Display Adapter
-   1039 6306  SiS530,620 GUI Accelerator+3D
6325  65x/M650/740 PCI/AGP VGA Display Adapter
1039 6325  SiS 651 onboard [Asus P4SC-EA]
1631 1004  SiS 651C onboard [Gigabyte GA-8SIML Rev1.0]
@@ -2722,6 +2730,7 @@
1092 0a70  SpeedStar A70
1092 4910  SpeedStar A70
1092 4920  SpeedStar A70
+   10b0 6326  S6110-B (AGP)
1569 6326  SiS6326 GUI Accelerator
6330  661/741/760 PCI/AGP or 662/761Gx PCIE VGA Display Adapter
1039 6330  [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter
@@ -2917,6 +2926,7 @@
 # Found on ASUS M2V motherboard
81e7  Realtek ALC-660 6-channel CODEC
81f4  EN7300TC512/TD/128M/A(C262G) [Graphics Card EN7300TC512]
+   82e8  M3N72-D
 1044  Adaptec (formerly DPT)
1012  Domino RAID Engine
a400  SmartCache/Raid I-IV Controller
@@ -3411,7 +3421,8 @@
6400  MPC190 Security Processor (S1 family, encryption)
6405  MPC184 Security Processor (S1 family)
 1058  Electronics & Telecommunications RSH
-1059  Teknor Industrial Computers Inc
+# Formerly: Teknor Industrial Computers Inc
+1059  Kontron
 105a  Promise Technology, Inc.
0d30  PDC20265 (FastTrak100 Lite/Ultra100)
1043 8042  AV7266-E South Bridge Promise RAID
@@ -5092,20 +5103,24 @@
10de 0c11  Winfast NF3250K8AA
1462 7030  K8N Neo-FSR v2.0
147b 1c0b  NF8 Mainboard
+   1849 00e0  Motherboard (one of many)
00e1  nForce3 250Gb Host Bridge
1043 813f  K8N-E
1462 7030  K8N Neo-FSR v2.0
147b 1c0b  NF8 Mainboard
+   1849 00e1  Motherboard (one of man

SPECS: java-puretls.spec - one more %%install fix

[pawelz]

Author: pawelz   Date: Mon Apr  6 10:40:19 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- one more %%install fix

 Files affected:
SPECS:
   java-puretls.spec (1.16 -> 1.17) 

 Diffs:


Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.16 SPECS/java-puretls.spec:1.17
--- SPECS/java-puretls.spec:1.16Mon Apr  6 12:34:20 2009
+++ SPECS/java-puretls.spec Mon Apr  6 12:40:14 2009
@@ -2,6 +2,7 @@
 # TODO:
 # - It uses sun's proprietari API provided by rt.jar from J2SE, so I have no 
idea
 #   how to build it using gcj.
+#   note this warning: [javac] 
/home/users/pawelz/rpm/BUILD.noarch-linux/puretls-0.9b5/src/COM/claymoresystems/provider/test/DSATest.java:51:
 warning: sun.security.provider.DSAPublicKey is Sun proprietary API and may be 
removed in a future release
 
 %bcond_without javadoc # don't build javadoc
 
@@ -91,8 +92,8 @@
 ln -sf %{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 
 cp build/%{srcname}demo.jar 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/%{srcname}-demo.jar
-cp *.pem $RPM_BUILD_ROOT%{_datadir}/%{srcname}
-cp test.pl $RPM_BUILD_ROOT%{_datadir}/%{srcname}
+cp *.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp test.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %if %{with javadoc}
 # javadoc
@@ -127,6 +128,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.17  2009/04/06 10:40:14  pawelz
+- one more %%install fix
+
 Revision 1.16  2009/04/06 10:34:20  pawelz
 - fixed Name
 - versioned java-cryptix dependency


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.16&r2=1.17&f=u

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

DISTFILES: jquery-1.3.2-release.zip jquery.field.0.9.2.zip jquery.form.js_0.txt core.ui.datepicker.zip jquery.history.js

[glen]

Files fetched: 1

ALREADY GOT: http://jqueryjs.googlecode.com/files/jquery-1.3.2-release.zip
4ad8132094787af619df708dbf7f1880  jquery-1.3.2-release.zip
ALREADY GOT: http://plugins.jquery.com/files/jquery.field.0.9.2.zip
1bd5d766f79034904a07ddbbab5cb27a  jquery.field.0.9.2.zip
ALREADY GOT: http://plugins.jquery.com/files/jquery.form.js_0.txt
8720eac9985a6b33e4f4087f2e01ce23  jquery.form.js_0.txt
ALREADY GOT: 
http://marcgrabanski.com/code/ui-datepicker/core/core.ui.datepicker.zip
46967b9c5ee626697b977e2909fb00b1  core.ui.datepicker.zip
STORED: http://www.mikage.to/jquery/jquery.history.js
57da738db33bc631da21aa294746e4da  jquery.history.js
Size: 5090 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: jquery.spec - fix md5

[glen]

Author: glen Date: Mon Apr  6 10:35:20 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- fix md5

 Files affected:
SPECS:
   jquery.spec (1.10 -> 1.11) 

 Diffs:


Index: SPECS/jquery.spec
diff -u SPECS/jquery.spec:1.10 SPECS/jquery.spec:1.11
--- SPECS/jquery.spec:1.10  Mon Apr  6 11:53:58 2009
+++ SPECS/jquery.spec   Mon Apr  6 12:35:15 2009
@@ -20,7 +20,7 @@
 Source3:   
http://marcgrabanski.com/code/ui-datepicker/core/core.ui.datepicker.zip
 # Source3-md5: 46967b9c5ee626697b977e2909fb00b1
 Source4:   http://www.mikage.to/jquery/%{name}.history.js
-# Source4-md5: b195f3560a66e4ba96f6644a62f83401
+# Source4-md5: 57da738db33bc631da21aa294746e4da
 Patch0:%{name}.history.konqueror.patch
 URL:   http://jquery.com/
 BuildRequires: rpmbuild(macros) > 1.268
@@ -145,6 +145,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.11  2009/04/06 10:35:15  glen
+- fix md5
+
 Revision 1.10  2009/04/06 09:53:58  glen
 - add jquery.history
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jquery.spec?r1=1.10&r2=1.11&f=u

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

SPECS: java-puretls.spec - fixed Name - versioned java-cryptix dependency -...

[pawelz]

Author: pawelz   Date: Mon Apr  6 10:34:25 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- fixed Name
- versioned java-cryptix dependency
- up to 0.9b5
- use dropin, because only working download URL contains '?'

 Files affected:
SPECS:
   java-puretls.spec (1.15 -> 1.16) 

 Diffs:


Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.15 SPECS/java-puretls.spec:1.16
--- SPECS/java-puretls.spec:1.15Mon Apr  6 12:11:28 2009
+++ SPECS/java-puretls.spec Mon Apr  6 12:34:20 2009
@@ -8,19 +8,19 @@
 %include   /usr/lib/rpm/macros.java
 
 %definesrcname puretls
-%definebetab4
+%definebetab5
 Summary:   Java implementation of SSLv3 and TLSv1
 Summary(pl.UTF-8): Implementacja SSLv3 i TLSv1 w Javie
-Name:  puretls
+Name:  java-puretls
 Version:   0.9
 Release:   0.%{beta}.1
 License:   BSD-like
 Group: Libraries/Java
-Source0:   
http://www.mirrors.wiretapped.net/security/cryptography/libraries/tls/puretls/%{srcname}-%{version}%{beta}.tar.gz
-# Source0-md5: b2e4e947af30387b86dbf3473fdbd103
+Source0:   %{srcname}-%{version}%{beta}.tar.gz
+# Source0-md5: f14690ef749f21dc3b98a7293191fff3
 URL:   http://www.rtfm.com/puretls/
 BuildRequires: ant
-BuildRequires: java-cryptix
+BuildRequires: java-cryptix >= 3.2.0
 BuildRequires: java-cryptix-asn1 = 0.2009
 BuildRequires: java-sun
 BuildRequires: jpackage-utils
@@ -29,7 +29,7 @@
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
-Requires:  cryptix
+Requires:  cryptix >= 3.2.0
 Requires:  cryptix-asn1 = 0.2009
 Requires:  java-sun-jre
 BuildArch: noarch
@@ -127,6 +127,12 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.16  2009/04/06 10:34:20  pawelz
+- fixed Name
+- versioned java-cryptix dependency
+- up to 0.9b5
+- use dropin, because only working download URL contains '?'
+
 Revision 1.15  2009/04/06 10:11:28  pawelz
 - force java-sun (see TODO)
 - fixed installation of examples


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.15&r2=1.16&f=u

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

DISTFILES: puretls-0.9b5.tar.gz

[pawelz]

Files fetched: 1

STORED: no-url://puretls-0.9b5.tar.gz
f14690ef749f21dc3b98a7293191fff3  puretls-0.9b5.tar.gz
Size: 222700 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: apache-tomcat.spec - configs should not be executable - missing dirs

[glen]

Author: glen Date: Mon Apr  6 10:30:02 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- configs should not be executable
- missing dirs

 Files affected:
SPECS:
   apache-tomcat.spec (1.85 -> 1.86) 

 Diffs:


Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.85 SPECS/apache-tomcat.spec:1.86
--- SPECS/apache-tomcat.spec:1.85   Fri Apr  3 22:19:57 2009
+++ SPECS/apache-tomcat.specMon Apr  6 12:29:57 2009
@@ -411,20 +411,21 @@
 %{_tomcatdir}/work
 %{_tomcatdir}/shared
 %dir %{_vardir}
-# tomcat config has to be writeable because of tomacta-users.xml file and
-# Catalina dir
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/MANIFEST.MF
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/catalina.policy
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.properties*
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.manifest
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/balancer.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/host-manager.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/jsp-examples.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/manager.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/ROOT.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/tomcat-docs.xml
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/webdav.xml
+%dir %{_vardir}/conf/Catalina
+%dir %{_vardir}/conf/Catalina/localhost
+# tomcat config has to be writeable because of tomacta-users.xml file and 
Catalina dir
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/MANIFEST.MF
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/catalina.policy
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.properties*
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.manifest
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/*.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/balancer.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/host-manager.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/jsp-examples.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/manager.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/ROOT.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/tomcat-docs.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/webdav.xml
 %dir %attr(1730,root,tomcat) %{_vardir}/work
 %dir %attr(775,root,tomcat) %{_vardir}/webapps
 %dir %attr(775,root,tomcat) %{_vardir}/temp
@@ -439,7 +440,7 @@
 
 %files admin
 %defattr(644,root,root,755)
-%config(noreplace) %attr(775,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/admin.xml
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) 
%{_vardir}/conf/Catalina/localhost/admin.xml
 %{_tomcatdir}/server/webapps/admin
 
 %files jasper
@@ -454,6 +455,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.86  2009/04/06 10:29:57  glen
+- configs should not be executable
+- missing dirs
+
 Revision 1.85  2009/04/03 20:19:57  paszczus
 - separeted admin webapp to -admin subpackage
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.85&r2=1.86&f=u

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

SPECS: template-java.spec - typo

[glen]

Author: glen Date: Mon Apr  6 10:23:38 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- typo

 Files affected:
SPECS:
   template-java.spec (1.35 -> 1.36) 

 Diffs:


Index: SPECS/template-java.spec
diff -u SPECS/template-java.spec:1.35 SPECS/template-java.spec:1.36
--- SPECS/template-java.spec:1.35   Fri Apr  3 17:57:29 2009
+++ SPECS/template-java.specMon Apr  6 12:23:32 2009
@@ -12,7 +12,7 @@
 #
 %include   /usr/lib/rpm/macros.java
 
-# Name without java- prefix. If it is aplication, not a library,
+# Name without java- prefix. If it is application, not a library,
 # just do s/srcname/name/g
 %definesrcname -
 Summary:   -
@@ -171,6 +171,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.36  2009/04/06 10:23:32  glen
+- typo
+
 Revision 1.35  2009/04/03 15:57:29  pawelz
 - typo
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/template-java.spec?r1=1.35&r2=1.36&f=u

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

SPECS: java-cryptix.spec - dropped P: jce (java-sun provides different JCE ...

[pawelz]

Author: pawelz   Date: Mon Apr  6 10:22:48 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- dropped P: jce (java-sun provides different JCE api (???))
- rel 2

 Files affected:
SPECS:
   java-cryptix.spec (1.15 -> 1.16) 

 Diffs:


Index: SPECS/java-cryptix.spec
diff -u SPECS/java-cryptix.spec:1.15 SPECS/java-cryptix.spec:1.16
--- SPECS/java-cryptix.spec:1.15Mon Apr  6 06:50:12 2009
+++ SPECS/java-cryptix.spec Mon Apr  6 12:22:43 2009
@@ -14,7 +14,7 @@
 Summary(pl.UTF-8): Pakiet kryptograficzny Javy
 Name:  java-cryptix
 Version:   3.2.0
-Release:   1
+Release:   2
 License:   BSD-like
 Group: Libraries/Java
 Source0:   
http://www.cryptix.org/dist/%{srcname}32-%{snapshot}-r%{version}.zip
@@ -29,7 +29,6 @@
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: unzip
 Requires:  jre >= 1.1
-Provides:  jce
 Obsoletes: cryptix
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,6 +106,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.16  2009/04/06 10:22:43  pawelz
+- dropped P: jce (java-sun provides different JCE api (???))
+- rel 2
+
 Revision 1.15  2009/04/06 04:50:12  pawelz
 - renamed from cryptix.spec
 - build javadoc (as separate package)


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-cryptix.spec?r1=1.15&r2=1.16&f=u

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

DISTFILES: ERRORS: opera-10.00-4268.gcc4-shared-qt3.i386.tar.bz2 opera-10.00-4268.gcc4-shared-qt3.x86_64.tar.bz2 opera-10.00-4268.unknown.i386.tar.bz2

[arekm]

opera.spec: undefined macro name


wget -nv --no-check-certificate --user-agent=PLD/distfiles -O 
./tmp/3034ce1f-bffb-4d32-a3c0-fe1244427c60/d41d8cd98f00b204e9800998ecf8427e/opera-10.00-4268.unknown.i386.tar.bz2
 
"http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.unknown.i386.tar.bz2":
http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.unknown.i386.tar.bz2:
2009-04-06 12:22:23 ERROR 404: Not Found.


FATAL: 
http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.unknown.i386.tar.bz2
 (d41d8cd98f00b204e9800998ecf8427e) was not fetched (wget -nv 
--no-check-certificate --user-agent=PLD/distfiles -O 
./tmp/3034ce1f-bffb-4d32-a3c0-fe1244427c60/d41d8cd98f00b204e9800998ecf8427e/opera-10.00-4268.unknown.i386.tar.bz2
 
"http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.unknown.i386.tar.bz2":
 
http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.unknown.i386.tar.bz2:
2009-04-06 12:22:23 ERROR 404: Not Found.
)

Files fetched: 2

STORED: 
http://snapshot.opera.com/unix/snapshot-4268/intel-linux/opera-10.00-4268.gcc4-shared-qt3.i386.tar.bz2
faae6e85b41b1b7bcb5e0d9b26f3c95d  
opera-10.00-4268.gcc4-shared-qt3.i386.tar.bz2
Size: 7948661 bytes
STORED: 
http://snapshot.opera.com/unix/snapshot-4268/x86_64-linux/opera-10.00-4268.gcc4-shared-qt3.x86_64.tar.bz2
f06f7af16d4701877f81d4bbae8e2b20  
opera-10.00-4268.gcc4-shared-qt3.x86_64.tar.bz2
Size: 8606394 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 (DEVEL): opera.spec - up to 4268 (remember to backup profile dir this...

[arekm]

Author: arekmDate: Mon Apr  6 10:21:59 2009 GMT
Module: SPECS Tag: DEVEL
 Log message:
- up to 4268 (remember to backup profile dir this time)

 Files affected:
SPECS:
   opera.spec (1.246.2.63 -> 1.246.2.64) 

 Diffs:


Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.246.2.63 SPECS/opera.spec:1.246.2.64
--- SPECS/opera.spec:1.246.2.63 Tue Mar 10 14:42:06 2009
+++ SPECS/opera.specMon Apr  6 12:21:54 2009
@@ -11,7 +11,7 @@
 
 %definever 10.00
 %definereltype snapshot
-%definemagicstr4205
+%definemagicstr4268
 
 %define sver%{ver}
 %defineshver   %(echo %{ver} | tr -d .)
@@ -19,7 +19,7 @@
 
 # http://my.opera.com/csant/blog/2007/09/06/which-is-which
 # http://my.opera.com/csant/blog/2008/05/20/which-is-which-part-two
-%definex86_shared_rel  gcc4-qt4
+%definex86_shared_rel  gcc4-shared-qt3
 %definex86_static_rel  unknown
 %definesparc_shared_relunknown
 %definesparc_static_relunknown
@@ -81,7 +81,7 @@
 Group: X11/Applications/Networking
 
 Source0:   
http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_shared_rel}.i386.tar.bz2
-# Source0-md5: 27cb2080c456cf1549ae55c298ee33c6
+# Source0-md5: faae6e85b41b1b7bcb5e0d9b26f3c95d
 %{!?with_distributable:NoSource:   0}
 
 #Source1:  
http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/sparc-linux/%{name}-%{sver}-%{magicstr}.%{sparc_shared_rel}-shared-qt.sparc.tar.bz2
@@ -93,11 +93,11 @@
 #%{!?with_distributable:NoSource:  2}
 
 Source3:   
http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/x86_64-linux/%{name}-%{sver}-%{magicstr}.%{x86_64_shared_rel}.x86_64.tar.bz2
-# Source3-md5: dc4a2f6c0b785c85af4d9daa70de53bc
+# Source3-md5: f06f7af16d4701877f81d4bbae8e2b20
 %{!?with_distributable:NoSource:3}
 
 Source10:  
http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/intel-linux/%{name}-%{sver}-%{magicstr}.%{x86_static_rel}.i386.tar.bz2
-# Source10-md5:e8138e29a06d0eac088ed5c3a82a3a55
+# Source10-md5:d41d8cd98f00b204e9800998ecf8427e
 %{!?with_distributable:NoSource:   10}
 
 #Source11: 
http://snapshot.opera.com/unix/%{sreltype}-%{magicstr}/sparc-linux/%{name}-%{sver}-%{magicstr}.%{sparc_static_rel}.sparc.tar.bz2
@@ -211,7 +211,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*rc*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*ini
 
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
@@ -227,13 +227,15 @@
 %dir %{_plugindir}
 %dir %{_datadir}/opera
 %{_datadir}/opera/*.*
-%{_datadir}/opera/ini
+%{_datadir}/opera/aux
+%{_datadir}/opera/defaults
 %{_datadir}/opera/java
 %{_datadir}/opera/skin
+%{_datadir}/opera/scripts
 %{_datadir}/opera/styles
+%{_datadir}/opera/ui
 %dir %{_datadir}/opera/locale
 %{_datadir}/opera/locale/en
-%{_datadir}/opera/locale/english.lng
 %lang(be) %{_datadir}/opera/locale/be
 %lang(bg) %{_datadir}/opera/locale/bg
 %lang(cs) %{_datadir}/opera/locale/cs
@@ -288,6 +290,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.246.2.64  2009/04/06 10:21:54  arekm
+- up to 4268 (remember to backup profile dir this time)
+
 Revision 1.246.2.63  2009/03/10 13:42:06  arekm
 - 4205
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opera.spec?r1=1.246.2.63&r2=1.246.2.64&f=u

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

SPECS: java-puretls.spec - force java-sun (see TODO) - fixed installation o...

[pawelz]

Author: pawelz   Date: Mon Apr  6 10:11:33 2009 GMT
Module: SPECS Tag: HEAD
 Log message:
- force java-sun (see TODO)
- fixed installation of examples

 Files affected:
SPECS:
   java-puretls.spec (1.14 -> 1.15) 

 Diffs:


Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.14 SPECS/java-puretls.spec:1.15
--- SPECS/java-puretls.spec:1.14Mon Apr  6 10:56:23 2009
+++ SPECS/java-puretls.spec Mon Apr  6 12:11:28 2009
@@ -1,12 +1,10 @@
 # $Revision$, $Date$
+# TODO:
+# - It uses sun's proprietari API provided by rt.jar from J2SE, so I have no 
idea
+#   how to build it using gcj.
+
 %bcond_without javadoc # don't build javadoc
 
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
-%bcond_withjava_sun# build with java-sun
-%endif
-#
 %include   /usr/lib/rpm/macros.java
 
 %definesrcname puretls
@@ -24,7 +22,7 @@
 BuildRequires: ant
 BuildRequires: java-cryptix
 BuildRequires: java-cryptix-asn1 = 0.2009
-#BuildRequires:java-gnu-getopt
+BuildRequires: java-sun
 BuildRequires: jpackage-utils
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: sed >= 4.0
@@ -33,6 +31,7 @@
 %endif
 Requires:  cryptix
 Requires:  cryptix-asn1 = 0.2009
+Requires:  java-sun-jre
 BuildArch: noarch
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,7 +90,7 @@
 cp build/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 ln -sf %{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 
-cp build/%{srcname}demo.jar 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}/%{srcname}-demo.jar
+cp build/%{srcname}demo.jar 
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/%{srcname}-demo.jar
 cp *.pem $RPM_BUILD_ROOT%{_datadir}/%{srcname}
 cp test.pl $RPM_BUILD_ROOT%{_datadir}/%{srcname}
 
@@ -128,6 +127,10 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.15  2009/04/06 10:11:28  pawelz
+- force java-sun (see TODO)
+- fixed installation of examples
+
 Revision 1.14  2009/04/06 08:56:23  pawelz
 - disabled BR gnu-getopt
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.14&r2=1.15&f=u

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