SPECS: pixieplus.spec - release 7 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:06:13 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 7 (rebuild with new ImageMagick)
Files affected:
SPECS:
pixieplus.spec (1.31 - 1.32)
Diffs:
Index: SPECS/pixieplus.spec
diff -u SPECS/pixieplus.spec:1.31 SPECS/pixieplus.spec:1.32
--- SPECS/pixieplus.spec:1.31 Mon Nov 28 13:36:05 2005
+++ SPECS/pixieplus.specWed Apr 5 16:06:02 2006
@@ -3,7 +3,7 @@
Summary(pl): pixieplus - przeglądarka obrazków dla KDE
Name: pixieplus
Version: 0.5.4.1
-Release: 6
+Release: 7
License: GPL
Group: X11/Applications/Graphics
Source0:
http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/%{name}-%{version}.tar.bz2
@@ -92,6 +92,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.32 2006/04/05 14:06:02 hawk
+- release 7 (rebuild with new ImageMagick)
+
Revision 1.31 2005/11/28 12:36:05 ankry
- kill internal gif compression; now it is available in ImageMagick
(pixieplus-no_internal_gif_compression.patch)
CVS-web:
http://cvs.pld-linux.org/SPECS/pixieplus.spec?r1=1.31r2=1.32f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: nurbs++.spec - release 8 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:07:50 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 8 (rebuild with new ImageMagick)
Files affected:
SPECS:
nurbs++.spec (1.33 - 1.34)
Diffs:
Index: SPECS/nurbs++.spec
diff -u SPECS/nurbs++.spec:1.33 SPECS/nurbs++.spec:1.34
--- SPECS/nurbs++.spec:1.33 Mon Oct 3 20:09:59 2005
+++ SPECS/nurbs++.spec Wed Apr 5 16:07:45 2006
@@ -7,7 +7,7 @@
Summary(pl): Biblioteka NURBS++
Name: nurbs++
Version: 3.0.11
-Release: 7
+Release: 8
License: GPL
Group: X11/Libraries
Source0: http://dl.sourceforge.net/libnurbs/%{name}-%{version}.tar.bz2
@@ -139,6 +139,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.34 2006/04/05 14:07:45 hawk
+- release 8 (rebuild with new ImageMagick)
+
Revision 1.33 2005/10/03 18:09:59 arekm
- br new imagemagick
CVS-web:
http://cvs.pld-linux.org/SPECS/nurbs++.spec?r1=1.33r2=1.34f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kismet.spec - release 3 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:08:12 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 3 (rebuild with new ImageMagick)
Files affected:
SPECS:
kismet.spec (1.26 - 1.27)
Diffs:
Index: SPECS/kismet.spec
diff -u SPECS/kismet.spec:1.26 SPECS/kismet.spec:1.27
--- SPECS/kismet.spec:1.26 Tue Dec 13 13:56:54 2005
+++ SPECS/kismet.spec Wed Apr 5 16:08:07 2006
@@ -8,7 +8,7 @@
Name: kismet
Version: 2005_08_R1
%define _ver 2005-08-R1
-Release: 2
+Release: 3
License: GPL
Group: Networking/Utilities
Source0: http://www.kismetwireless.net/code/%{name}-%{_ver}.tar.gz
@@ -96,6 +96,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.27 2006/04/05 14:08:07 hawk
+- release 3 (rebuild with new ImageMagick)
+
Revision 1.26 2005/12/13 12:56:54 glen
- adapterized (sorted %verify attrs)
CVS-web:
http://cvs.pld-linux.org/SPECS/kismet.spec?r1=1.26r2=1.27f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: frontline.spec - release 12 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:10:44 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 12 (rebuild with new ImageMagick)
Files affected:
SPECS:
frontline.spec (1.22 - 1.23)
Diffs:
Index: SPECS/frontline.spec
diff -u SPECS/frontline.spec:1.22 SPECS/frontline.spec:1.23
--- SPECS/frontline.spec:1.22 Wed Oct 5 14:43:12 2005
+++ SPECS/frontline.specWed Apr 5 16:10:38 2006
@@ -7,7 +7,7 @@
Summary(pl): Graficzny interfejs do autotrace wyciągającego obrysy z obrazków
Name: frontline
Version: 0.5.4
-Release: 11
+Release: 12
License: GPL
Group: X11/Applications/Graphics
Source0: http://dl.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
@@ -172,6 +172,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.23 2006/04/05 14:10:38 hawk
+- release 12 (rebuild with new ImageMagick)
+
Revision 1.22 2005/10/05 12:43:12 arekm
- rel 11
CVS-web:
http://cvs.pld-linux.org/SPECS/frontline.spec?r1=1.22r2=1.23f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: autotrace.spec - release 7 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:11:10 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 7 (rebuild with new ImageMagick)
Files affected:
SPECS:
autotrace.spec (1.25 - 1.26)
Diffs:
Index: SPECS/autotrace.spec
diff -u SPECS/autotrace.spec:1.25 SPECS/autotrace.spec:1.26
--- SPECS/autotrace.spec:1.25 Mon Oct 3 20:09:59 2005
+++ SPECS/autotrace.specWed Apr 5 16:11:04 2006
@@ -3,7 +3,7 @@
Summary(pl): AutoTrace - konwerter grafiki rastrowej do wektorowej
Name: autotrace
Version: 0.31.1
-Release: 6
+Release: 7
License: GPL
Group: Applications
Source0: http://dl.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
@@ -116,6 +116,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.26 2006/04/05 14:11:04 hawk
+- release 7 (rebuild with new ImageMagick)
+
Revision 1.25 2005/10/03 18:09:59 arekm
- br new imagemagick
CVS-web:
http://cvs.pld-linux.org/SPECS/autotrace.spec?r1=1.25r2=1.26f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: koffice.spec - release 6 (rebuild with new ImageMagick)
Author: hawk Date: Wed Apr 5 14:13:08 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 6 (rebuild with new ImageMagick)
Files affected:
SPECS:
koffice.spec (1.145 - 1.146)
Diffs:
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.145 SPECS/koffice.spec:1.146
--- SPECS/koffice.spec:1.145Mon Mar 27 14:41:36 2006
+++ SPECS/koffice.spec Wed Apr 5 16:13:03 2006
@@ -13,7 +13,7 @@
Summary(zh_CN):KDE ľÄ°ěšŤÓŚÓĂČíźţźŻĄŁ
Name: koffice
Version: %{_ver}
-Release: 5
+Release: 6
Epoch: 5
License: GPL/LGPL
Group: X11/Applications
@@ -898,6 +898,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.146 2006/04/05 14:13:03 hawk
+- release 6 (rebuild with new ImageMagick)
+
Revision 1.145 2006/03/27 12:41:36 glen
- rel 5 (libmysqlclient_15)
CVS-web:
http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.145r2=1.146f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): DirectFB.spec - mmx/sse enabled for x86-64 - pp...
Author: hawk Date: Wed Apr 5 21:45:52 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- mmx/sse enabled for x86-64
- ppc/llh build fix
Files affected:
SPECS:
DirectFB.spec (1.65 - 1.65.2.1)
Diffs:
Index: SPECS/DirectFB.spec
diff -u SPECS/DirectFB.spec:1.65 SPECS/DirectFB.spec:1.65.2.1
--- SPECS/DirectFB.spec:1.65Mon Jan 23 16:08:55 2006
+++ SPECS/DirectFB.spec Wed Apr 5 23:45:47 2006
@@ -19,6 +19,7 @@
Patch1:%{name}-pmake.patch
Patch2:%{name}-fix.patch
Patch3:%{name}-sh.patch
+Patch4:%{name}-llh-ppc.patch
URL: http://www.directfb.org/
BuildRequires: SDL-devel
BuildRequires: XFree86-devel
@@ -201,6 +202,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
@@ -224,7 +226,7 @@
--enable-voodoo \
--enable-x11 \
--enable-zlib \
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
%ifnarch i386 i486
--enable-mmx \
%endif
@@ -393,6 +395,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.65.2.1 2006/04/05 21:45:47 hawk
+- mmx/sse enabled for x86-64
+- ppc/llh build fix
+
Revision 1.65 2006/01/23 15:08:55 qboosh
- current policy is not to R: pkgconfig just because package has pkgconfig
support
CVS-web:
http://cvs.pld-linux.org/SPECS/DirectFB.spec?r1=1.65r2=1.65.2.1f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): DirectFB.spec - blah, fix amd64
Author: hawk Date: Wed Apr 5 21:50:49 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- blah, fix amd64
Files affected:
SPECS:
DirectFB.spec (1.65.2.1 - 1.65.2.2)
Diffs:
Index: SPECS/DirectFB.spec
diff -u SPECS/DirectFB.spec:1.65.2.1 SPECS/DirectFB.spec:1.65.2.2
--- SPECS/DirectFB.spec:1.65.2.1Wed Apr 5 23:45:47 2006
+++ SPECS/DirectFB.spec Wed Apr 5 23:50:44 2006
@@ -235,7 +235,8 @@
%endif
%endif
-%{__make}
+%{__make} \
+ X11_LIBS=%{_prefix}/X11R6/%{_lib}
%install
rm -rf $RPM_BUILD_ROOT
@@ -395,6 +396,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.65.2.2 2006/04/05 21:50:44 hawk
+- blah, fix amd64
+
Revision 1.65.2.1 2006/04/05 21:45:47 hawk
- mmx/sse enabled for x86-64
- ppc/llh build fix
CVS-web:
http://cvs.pld-linux.org/SPECS/DirectFB.spec?r1=1.65.2.1r2=1.65.2.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): DirectFB.spec - one more fix from HEAD
Author: hawk Date: Wed Apr 5 22:05:12 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- one more fix from HEAD
Files affected:
SPECS:
DirectFB.spec (1.65.2.2 - 1.65.2.3)
Diffs:
Index: SPECS/DirectFB.spec
diff -u SPECS/DirectFB.spec:1.65.2.2 SPECS/DirectFB.spec:1.65.2.3
--- SPECS/DirectFB.spec:1.65.2.2Wed Apr 5 23:50:44 2006
+++ SPECS/DirectFB.spec Thu Apr 6 00:05:06 2006
@@ -39,6 +39,8 @@
%definedfbdir %{_libdir}/directfb-%{version}
+%definespecflags -fno-strict-aliasing
+
%ifarch %{ix86}
# gcc running out of registers with -O0 in generic_mmx.h
%definedebugcflags -O1 -g
@@ -396,6 +398,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.65.2.3 2006/04/05 22:05:06 hawk
+- one more fix from HEAD
+
Revision 1.65.2.2 2006/04/05 21:50:44 hawk
- blah, fix amd64
CVS-web:
http://cvs.pld-linux.org/SPECS/DirectFB.spec?r1=1.65.2.2r2=1.65.2.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): DirectFB.spec - release 2
Author: hawk Date: Wed Apr 5 22:16:55 2006 GMT Module: SPECS Tag: AC-branch Log message: - release 2 Files affected: SPECS: DirectFB.spec (1.68 - 1.68.2.1) Diffs: Index: SPECS/DirectFB.spec diff -u SPECS/DirectFB.spec:1.68 SPECS/DirectFB.spec:1.68.2.1 --- SPECS/DirectFB.spec:1.68Fri Jan 27 22:01:30 2006 +++ SPECS/DirectFB.spec Thu Apr 6 00:16:50 2006 @@ -22,7 +22,7 @@ Summary(pl): DirectFB - Wspomaganie grafiki Name: DirectFB Version: 0.9.24 -Release: 1.1 +Release: 2 Epoch: 1 License: LGPL v2+ Group: Libraries @@ -415,6 +415,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.68.2.1 2006/04/05 22:16:50 hawk +- release 2 + Revision 1.68 2006/01/27 21:01:30 pluto - gcc4 patch updated. CVS-web: http://cvs.pld-linux.org/SPECS/DirectFB.spec?r1=1.68r2=1.68.2.1f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: iptables24.spec - release 15
Author: hawk Date: Wed Apr 5 22:20:48 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 15
Files affected:
SPECS:
iptables24.spec (1.39 - 1.40)
Diffs:
Index: SPECS/iptables24.spec
diff -u SPECS/iptables24.spec:1.39 SPECS/iptables24.spec:1.40
--- SPECS/iptables24.spec:1.39 Fri Feb 24 15:24:11 2006
+++ SPECS/iptables24.spec Thu Apr 6 00:20:43 2006
@@ -20,7 +20,7 @@
%else
Version: %{iptables_version}
%endif
-%define_rel14
+%define_rel15
Release: [EMAIL PROTECTED]
License: GPL
Vendor:Netfilter mailing list netfilter@lists.samba.org
@@ -289,6 +289,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.40 2006/04/05 22:20:43 hawk
+- release 15
+
Revision 1.39 2006/02/24 14:24:11 gotar
- added ipt_account from 1.2.11
CVS-web:
http://cvs.pld-linux.org/SPECS/iptables24.spec?r1=1.39r2=1.40f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kernel24-net-e1000.spec, kernel24-net-e100.spec - release 2
Author: hawk Date: Wed Apr 5 22:23:30 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 2
Files affected:
SPECS:
kernel24-net-e1000.spec (1.2 - 1.3) , kernel24-net-e100.spec (1.2 - 1.3)
Diffs:
Index: SPECS/kernel24-net-e1000.spec
diff -u SPECS/kernel24-net-e1000.spec:1.2 SPECS/kernel24-net-e1000.spec:1.3
--- SPECS/kernel24-net-e1000.spec:1.2 Mon Apr 3 10:49:15 2006
+++ SPECS/kernel24-net-e1000.spec Thu Apr 6 00:23:24 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/1000
Name: kernel24-net-%{_orig_name}
Version: 7.0.33
-%define_rel1
+%define_rel2
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -119,6 +119,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2006/04/05 22:23:24 hawk
+- release 2
+
Revision 1.2 2006/04/03 08:49:15 hawk
- updated to 7.0.33
- updated source URL
Index: SPECS/kernel24-net-e100.spec
diff -u SPECS/kernel24-net-e100.spec:1.2 SPECS/kernel24-net-e100.spec:1.3
--- SPECS/kernel24-net-e100.spec:1.2Wed Apr 5 10:38:45 2006
+++ SPECS/kernel24-net-e100.specThu Apr 6 00:23:24 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/100
Name: kernel24-net-%{_orig_name}
Version: 3.5.10
-%define_rel1
+%define_rel2
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -127,6 +127,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2006/04/05 22:23:24 hawk
+- release 2
+
Revision 1.2 2006/04/05 08:38:45 marcus
- fixed names (kernel24-*, not kernel-*)
CVS-web:
http://cvs.pld-linux.org/SPECS/kernel24-net-e1000.spec?r1=1.2r2=1.3f=u
http://cvs.pld-linux.org/SPECS/kernel24-net-e100.spec?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kernel24.spec - ehh, i2c 2.10.0, release 6
Author: hawk Date: Wed Apr 5 22:46:34 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- ehh, i2c 2.10.0, release 6
Files affected:
SPECS:
kernel24.spec (1.764 - 1.765)
Diffs:
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.764 SPECS/kernel24.spec:1.765
--- SPECS/kernel24.spec:1.764 Thu Mar 30 11:55:43 2006
+++ SPECS/kernel24.spec Thu Apr 6 00:46:29 2006
@@ -22,7 +22,7 @@
#
%definepre_version %{nil}
%definenetfilter_snap 20040302
-%definei2c_version 2.9.2
+%definei2c_version 2.10.0
%definedrm_xfree_version 4.3.0
Summary: The Linux kernel (the core of the Linux operating system)
Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -33,7 +33,7 @@
Summary(pt_BR):Kernel Linux (a parte central do sistema operacional
Linux)
Name: kernel24
Version: 2.4.32
-Release: 5%{?with_um:um}
+Release: 6%{?with_um:um}
License: GPL v2
Group: Base/Kernel
Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{version}.tar.bz2
@@ -189,7 +189,7 @@
Patch240: linux-2.4.20-ecc.patch
# i2c - http://secure.netroedge.com/~lm78/
# http://khali.linux-fr.org/devel/i2c/
-Patch255:
http://khali.linux-fr.org/devel/i2c/linux-2.4.31/linux-2.4.31-i2c-%{i2c_version}-drivers-i2c.diff
+Patch255:
http://khali.linux-fr.org/devel/i2c/linux-2.4.32/linux-2.4.32-i2c-%{i2c_version}-drivers-i2c.diff
Patch256: linux-2.4.21-i2c-headers.patch
Patch257: linux-2.4.21-i2c-sparc64.patch
Patch265: linux-2.4.20-e820.patch
@@ -1709,6 +1709,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.765 2006/04/05 22:46:29 hawk
+- ehh, i2c 2.10.0, release 6
+
Revision 1.764 2006/03/30 09:55:43 marcus
- ebtables-brnf-10
CVS-web:
http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.764r2=1.765f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: linux-2.4.32-i2c-2.10.0-drivers-i2c.diff (NEW) b41acb0d9e...
Author: hawk Date: Wed Apr 5 22:47:55 2006 GMT Module: SOURCES Tag: HEAD Log message: b41acb0d9e4eefd1aa9d0e9ff5f54220 linux-2.4.32-i2c-2.10.0-drivers-i2c.diff Files affected: SOURCES: linux-2.4.32-i2c-2.10.0-drivers-i2c.diff (NONE - 1.1) (NEW) Diffs: Index: SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff diff -u /dev/null SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff:1.1 --- /dev/null Thu Apr 6 00:47:55 2006 +++ SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diffThu Apr 6 00:47:50 2006 @@ -0,0 +1,7718 @@ +--- linux-old/Documentation/Configure.help Sat Feb 18 17:38:46 2006 linux/Documentation/Configure.help Sun Feb 19 08:27:20 2006 +@@ -19368,6 +19368,16 @@ + file:Documentation/modules.txt. + The module will be called i2c-velleman.o. + ++Basic I2C on Parallel Port adapter ++CONFIG_I2C_PPORT ++ This supports directly connecting I2C devices to the parallel port. ++ See file:Documentation/i2c/i2c-pport for more information. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-pport.o. ++ + I2C PCF 8584 interfaces + CONFIG_I2C_ALGOPCF + This allows you to use a range of I2C adapters called PCF adapters. +@@ -19389,6 +19399,15 @@ + file:Documentation/modules.txt. + The module will be called i2c-elektor.o. + ++PCF on the EPP Parallel Port ++CONFIG_I2C_PCFEPP ++ This supports the PCF8584 connected to the parallel port. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-pcf-epp.o. ++ + ITE I2C Algorithm + CONFIG_ITE_I2C_ALGO + This supports the use the ITE8172 I2C interface found on some MIPS +@@ -19426,6 +19445,51 @@ + Supports the SGI interfaces like the ones found on SGI Indy VINO + or SGI O2 MACE. + ++Motorola 8xx I2C algorithm ++CONFIG_I2C_ALGO8XX ++ This is the algorithm that allows you to use Motorola 8xx I2C adapters. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-algo-8xx.o. ++ ++Motorola 8xx I2C interface ++CONFIG_I2C_RPXLITE ++ This supports the Motorola 8xx I2C device. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-rpx.o. ++ ++IBM 405 I2C algorithm ++CONFIG_I2C_IBM_OCP_ALGO ++ This is the algorithm that allows you to use IBM 405 I2C adapters. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-algo-ibm_ocp.o. ++ ++IBM 405 I2C interface ++CONFIG_I2C_IBM_OCP_ADAP ++ This supports the IBM 405 I2C device. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-adap-ibm_ocp.o. ++ ++StrongARM SA-1110 interface ++CONFIG_I2C_FRODO ++ This supports the StrongARM SA-1110 Development Board. ++ ++ This driver is also available as a module. If you want to compile ++ it as a module, say M here and read ++ file:Documentation/modules.txt. ++ The module will be called i2c-frodo.o. ++ + I2C device interface + CONFIG_I2C_CHARDEV + Say Y here to use i2c-* device files, usually found in the /dev +--- linux-old/drivers/i2c/Config.inWed Apr 14 13:05:29 2004 linux/drivers/i2c/Config.inSun Feb 19 08:27:20 2006 +@@ -12,6 +12,10 @@ + dep_tristate ' Philips style parallel port adapter' CONFIG_I2C_PHILIPSPAR $CONFIG_I2C_ALGOBIT $CONFIG_PARPORT + dep_tristate ' ELV adapter' CONFIG_I2C_ELV $CONFIG_I2C_ALGOBIT + dep_tristate ' Velleman K8000 adapter' CONFIG_I2C_VELLEMAN $CONFIG_I2C_ALGOBIT ++ dep_tristate ' Basic I2C on Parallel Port' CONFIG_I2C_PPORT $CONFIG_I2C_ALGOBIT ++ if [ $CONFIG_ARCH_SA1100 = y ]; then ++ dep_tristate 'SA1100 I2C Adapter' CONFIG_I2C_FRODO $CONFIG_I2C_ALGOBIT ++ fi + dep_tristate ' NatSemi SCx200 I2C using GPIO pins' CONFIG_SCx200_I2C $CONFIG_SCx200_GPIO $CONFIG_I2C_ALGOBIT + if [ $CONFIG_SCx200_I2C != n ]; then + int 'GPIO pin used for SCL' CONFIG_SCx200_I2C_SCL 12 +@@ -24,6 +28,7 @@ +dep_tristate 'I2C PCF 8584 interfaces' CONFIG_I2C_ALGOPCF $CONFIG_I2C +if [ $CONFIG_I2C_ALGOPCF != n ]; then + dep_tristate ' Elektor ISA card' CONFIG_I2C_ELEKTOR $CONFIG_I2C_ALGOPCF ++ dep_tristate ' PCF on EPP port' CONFIG_I2C_PCFEPP $CONFIG_I2C_ALGOPCF +fi + +if [ $CONFIG_MIPS_ITE8172 = y ]; then +@@ -58,6 +63,13 @@ + dep_tristate
SOURCES: linux-2.4.31-i2c-2.9.2-drivers-i2c.diff (REMOVED) - outdated
Author: hawk Date: Wed Apr 5 22:49:33 2006 GMT Module: SOURCES Tag: HEAD Log message: - outdated Files affected: SOURCES: linux-2.4.31-i2c-2.9.2-drivers-i2c.diff (1.1 - NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: links-hacked.spec - release 6 (rebuild with new DirectFB)
Author: hawk Date: Wed Apr 5 23:44:30 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 6 (rebuild with new DirectFB)
Files affected:
SPECS:
links-hacked.spec (1.25 - 1.26)
Diffs:
Index: SPECS/links-hacked.spec
diff -u SPECS/links-hacked.spec:1.25 SPECS/links-hacked.spec:1.26
--- SPECS/links-hacked.spec:1.25Sat Jan 15 19:04:18 2005
+++ SPECS/links-hacked.spec Thu Apr 6 01:44:24 2006
@@ -18,7 +18,7 @@
Summary(uk): ôĹËÓÔĎ×ÉĘ WWW ÂŇĎŐÚĹŇ ÔÉĐŐ Lynx
Name: links-hacked
Version: 031220
-Release: 5
+Release: 6
License: GPL v2
Group: Applications/Networking
Source0:
http://xray.sai.msu.ru/~karpov/links-hacked/downloads/%{name}-%{version}.tgz
@@ -173,6 +173,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.26 2006/04/05 23:44:24 hawk
+- release 6 (rebuild with new DirectFB)
+
Revision 1.25 2005/01/15 18:04:18 qboosh
- added en-fix,pl-update patches; release 5
CVS-web:
http://cvs.pld-linux.org/SPECS/links-hacked.spec?r1=1.25r2=1.26f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: links2.spec - release 2 (rebuild with new DirectFB)
Author: hawk Date: Wed Apr 5 23:44:54 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 2 (rebuild with new DirectFB)
Files affected:
SPECS:
links2.spec (1.55 - 1.56)
Diffs:
Index: SPECS/links2.spec
diff -u SPECS/links2.spec:1.55 SPECS/links2.spec:1.56
--- SPECS/links2.spec:1.55 Sat Mar 25 16:39:38 2006
+++ SPECS/links2.spec Thu Apr 6 01:44:49 2006
@@ -18,7 +18,7 @@
%definepre pre20
# XXX: stop using pre in Version after 2.1 release!
Version: 2.1%{pre}
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2
Group: Applications/Networking
@@ -184,6 +184,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.56 2006/04/05 23:44:49 hawk
+- release 2 (rebuild with new DirectFB)
+
Revision 1.55 2006/03/25 15:39:38 megabajt
- modular xorg deps
CVS-web:
http://cvs.pld-linux.org/SPECS/links2.spec?r1=1.55r2=1.56f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): links2.spec - doh... release 2 (rebuild with ne...
Author: hawk Date: Wed Apr 5 23:47:41 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- doh... release 2 (rebuild with new DirectFB)
Files affected:
SPECS:
links2.spec (1.54 - 1.54.2.1)
Diffs:
Index: SPECS/links2.spec
diff -u SPECS/links2.spec:1.54 SPECS/links2.spec:1.54.2.1
--- SPECS/links2.spec:1.54 Sat Dec 24 20:27:12 2005
+++ SPECS/links2.spec Thu Apr 6 01:47:36 2006
@@ -18,7 +18,7 @@
%definepre pre20
# XXX: stop using pre in Version after 2.1 release!
Version: 2.1%{pre}
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2
Group: Applications/Networking
@@ -184,6 +184,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.54.2.1 2006/04/05 23:47:36 hawk
+- doh... release 2 (rebuild with new DirectFB)
+
Revision 1.54 2005/12/24 19:27:12 qboosh
- updated to 2.1pre20, updated pl-update patch
CVS-web:
http://cvs.pld-linux.org/SPECS/links2.spec?r1=1.54r2=1.54.2.1f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: DFBPoint.spec - release 3 (rebuild with new DirectFB)
Author: hawk Date: Wed Apr 5 23:50:30 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 3 (rebuild with new DirectFB)
Files affected:
SPECS:
DFBPoint.spec (1.5 - 1.6)
Diffs:
Index: SPECS/DFBPoint.spec
diff -u SPECS/DFBPoint.spec:1.5 SPECS/DFBPoint.spec:1.6
--- SPECS/DFBPoint.spec:1.5 Sun Oct 23 19:07:01 2005
+++ SPECS/DFBPoint.spec Thu Apr 6 01:50:24 2006
@@ -3,7 +3,7 @@
Summary(pl): DFBPoint - przeglądarka prezentacji używająca DirectFB
Name: DFBPoint
Version: 0.7.2
-Release: 2
+Release: 3
License: GPL
Group: Applications/Graphics
Source0:
http://www.directfb.org/download/DFBPoint/%{name}-%{version}.tar.gz
@@ -58,6 +58,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.6 2006/04/05 23:50:24 hawk
+- release 3 (rebuild with new DirectFB)
+
Revision 1.5 2005/10/23 17:07:01 qboosh
- more specific URL
CVS-web:
http://cvs.pld-linux.org/SPECS/DFBPoint.spec?r1=1.5r2=1.6f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: DFBSee.spec - release 3 (rebuild with new DirectFB)
Author: hawk Date: Wed Apr 5 23:51:57 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 3 (rebuild with new DirectFB)
Files affected:
SPECS:
DFBSee.spec (1.8 - 1.9)
Diffs:
Index: SPECS/DFBSee.spec
diff -u SPECS/DFBSee.spec:1.8 SPECS/DFBSee.spec:1.9
--- SPECS/DFBSee.spec:1.8 Sun Oct 23 19:08:05 2005
+++ SPECS/DFBSee.spec Thu Apr 6 01:51:52 2006
@@ -3,7 +3,7 @@
Summary(pl): DirectFBSee - przeglądarka obrazków i filmów dla linuksowego
framebuffera
Name: DFBSee
Version: 0.7.4
-Release: 2
+Release: 3
License: GPL
Group: Applications/Graphics
Source0:
http://www.directfb.org/download/DFBSee/%{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.9 2006/04/05 23:51:52 hawk
+- release 3 (rebuild with new DirectFB)
+
Revision 1.8 2005/10/23 17:08:05 qboosh
- more specific URL
CVS-web:
http://cvs.pld-linux.org/SPECS/DFBSee.spec?r1=1.8r2=1.9f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): gstreamer-plugins.spec - release 4 (rebuild wit...
Author: hawk Date: Wed Apr 5 23:57:18 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- release 4 (rebuild with new DirectFB)
Files affected:
SPECS:
gstreamer-plugins.spec (1.171 - 1.171.2.1)
Diffs:
Index: SPECS/gstreamer-plugins.spec
diff -u SPECS/gstreamer-plugins.spec:1.171
SPECS/gstreamer-plugins.spec:1.171.2.1
--- SPECS/gstreamer-plugins.spec:1.171 Wed Mar 1 00:37:25 2006
+++ SPECS/gstreamer-plugins.specThu Apr 6 01:57:12 2006
@@ -55,7 +55,7 @@
Summary(pl): Wtyczki do środowiska obróbki strumieni GStreamer
Name: gstreamer-plugins
Version: 0.8.11
-Release: 3
+Release: 4
License: LGPL
Group: Libraries
Source0:
http://gstreamer.freedesktop.org/src/gst-plugins/%{gstname}-%{version}.tar.bz2
@@ -2211,6 +2211,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.171.2.1 2006/04/05 23:57:12 hawk
+- release 4 (rebuild with new DirectFB)
+
Revision 1.171 2006/02/28 23:37:25 glen
- adapterized (killed trailing spaces/tabs)
CVS-web:
http://cvs.pld-linux.org/SPECS/gstreamer-plugins.spec?r1=1.171r2=1.171.2.1f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: DFBSee-API-fix.patch (NEW) - API related compilation fix ...
Author: hawk Date: Thu Apr 6 11:23:07 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- API related compilation fix taken from DirectFB CVS
Files affected:
SOURCES:
DFBSee-API-fix.patch (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/DFBSee-API-fix.patch
diff -u /dev/null SOURCES/DFBSee-API-fix.patch:1.1
--- /dev/null Thu Apr 6 13:23:07 2006
+++ SOURCES/DFBSee-API-fix.patchThu Apr 6 13:23:02 2006
@@ -0,0 +1,33 @@
+===
+RCS file: /cvs/directfb/DFBSee/src/main.c,v
+retrieving revision 1.58
+retrieving revision 1.59
+diff -u -r1.58 -r1.59
+--- DFBSee/src/main.c 2002/11/01 23:08:39 1.58
DFBSee/src/main.c 2005/04/09 20:53:16 1.59
+@@ -53,10 +53,10 @@
+ main (intargc,
+ char **argv)
+ {
+- DFBCardCapabilitiescaps;
+- DFBSurfaceDescription dsc;
+- IDirectFBEventBuffer *buffer;
+- IDirectFBSurface *image_area;
++ DFBGraphicsDeviceDescription desc;
++ DFBSurfaceDescription dsc;
++ IDirectFBEventBuffer *buffer;
++ IDirectFBSurface *image_area;
+ Media *media = NULL;
+ double zoom;
+ double adjust;
+@@ -78,8 +78,8 @@
+ /* create the super interface */
+ DFBCHECK (DirectFBCreate (dfb));
+
+- dfb-GetCardCapabilities (dfb, caps);
+- hw_stretchblit = caps.acceleration_mask DFXL_STRETCHBLIT;
++ dfb-GetDeviceDescription (dfb, desc);
++ hw_stretchblit = desc.acceleration_mask DFXL_STRETCHBLIT;
+
+ dfb-SetCooperativeLevel (dfb, DFSCL_FULLSCREEN);
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: DFBSee.spec - compilation fix from DirectFB CVS - release 4
Author: hawk Date: Thu Apr 6 11:23:43 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- compilation fix from DirectFB CVS
- release 4
Files affected:
SPECS:
DFBSee.spec (1.9 - 1.10)
Diffs:
Index: SPECS/DFBSee.spec
diff -u SPECS/DFBSee.spec:1.9 SPECS/DFBSee.spec:1.10
--- SPECS/DFBSee.spec:1.9 Thu Apr 6 01:51:52 2006
+++ SPECS/DFBSee.spec Thu Apr 6 13:23:37 2006
@@ -3,11 +3,12 @@
Summary(pl): DirectFBSee - przeglądarka obrazków i filmów dla linuksowego
framebuffera
Name: DFBSee
Version: 0.7.4
-Release: 3
+Release: 4
License: GPL
Group: Applications/Graphics
Source0:
http://www.directfb.org/download/DFBSee/%{name}-%{version}.tar.gz
# Source0-md5: 3320a976457d3b3e9eaef530fdf56b37
+Patch0:%{name}-API-fix.patch
URL:
http://www.directfb.org/index.php?path=Development/Projects/DFBSee
BuildRequires: DirectFB-devel = 0.9.15
BuildRequires: autoconf
@@ -30,6 +31,7 @@
%prep
%setup -q
+%patch0 -p1
%build
cp -f /usr/share/automake/config.sub .
@@ -59,6 +61,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.10 2006/04/06 11:23:37 hawk
+- compilation fix from DirectFB CVS
+- release 4
+
Revision 1.9 2006/04/05 23:51:52 hawk
- release 3 (rebuild with new DirectFB)
CVS-web:
http://cvs.pld-linux.org/SPECS/DFBSee.spec?r1=1.9r2=1.10f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: iptables24.spec - release 16
Author: hawk Date: Thu Apr 6 16:35:32 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 16
Files affected:
SPECS:
iptables24.spec (1.40 - 1.41)
Diffs:
Index: SPECS/iptables24.spec
diff -u SPECS/iptables24.spec:1.40 SPECS/iptables24.spec:1.41
--- SPECS/iptables24.spec:1.40 Thu Apr 6 00:20:43 2006
+++ SPECS/iptables24.spec Thu Apr 6 18:35:27 2006
@@ -20,7 +20,7 @@
%else
Version: %{iptables_version}
%endif
-%define_rel15
+%define_rel16
Release: [EMAIL PROTECTED]
License: GPL
Vendor:Netfilter mailing list netfilter@lists.samba.org
@@ -289,6 +289,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.41 2006/04/06 16:35:27 hawk
+- release 16
+
Revision 1.40 2006/04/05 22:20:43 hawk
- release 15
CVS-web:
http://cvs.pld-linux.org/SPECS/iptables24.spec?r1=1.40r2=1.41f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kernel24-net-e100.spec, kernel24-net-e1000.spec - release 3
Author: hawk Date: Thu Apr 6 16:36:07 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 3
Files affected:
SPECS:
kernel24-net-e100.spec (1.3 - 1.4) , kernel24-net-e1000.spec (1.3 - 1.4)
Diffs:
Index: SPECS/kernel24-net-e100.spec
diff -u SPECS/kernel24-net-e100.spec:1.3 SPECS/kernel24-net-e100.spec:1.4
--- SPECS/kernel24-net-e100.spec:1.3Thu Apr 6 00:23:24 2006
+++ SPECS/kernel24-net-e100.specThu Apr 6 18:36:01 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/100
Name: kernel24-net-%{_orig_name}
Version: 3.5.10
-%define_rel2
+%define_rel3
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -127,6 +127,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.4 2006/04/06 16:36:01 hawk
+- release 3
+
Revision 1.3 2006/04/05 22:23:24 hawk
- release 2
Index: SPECS/kernel24-net-e1000.spec
diff -u SPECS/kernel24-net-e1000.spec:1.3 SPECS/kernel24-net-e1000.spec:1.4
--- SPECS/kernel24-net-e1000.spec:1.3 Thu Apr 6 00:23:24 2006
+++ SPECS/kernel24-net-e1000.spec Thu Apr 6 18:36:02 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/1000
Name: kernel24-net-%{_orig_name}
Version: 7.0.33
-%define_rel2
+%define_rel3
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -119,6 +119,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.4 2006/04/06 16:36:02 hawk
+- release 3
+
Revision 1.3 2006/04/05 22:23:24 hawk
- release 2
CVS-web:
http://cvs.pld-linux.org/SPECS/kernel24-net-e100.spec?r1=1.3r2=1.4f=u
http://cvs.pld-linux.org/SPECS/kernel24-net-e1000.spec?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): em8300.spec - release 5
Author: hawk Date: Thu Apr 6 20:54:43 2006 GMT Module: SPECS Tag: AC-branch Log message: - release 5 Files affected: SPECS: em8300.spec (1.24.2.2 - 1.24.2.2.2.1) Diffs: Index: SPECS/em8300.spec diff -u SPECS/em8300.spec:1.24.2.2 SPECS/em8300.spec:1.24.2.2.2.1 --- SPECS/em8300.spec:1.24.2.2 Fri Mar 18 11:44:37 2005 +++ SPECS/em8300.spec Thu Apr 6 22:54:38 2006 @@ -11,7 +11,7 @@ %else %undefine with_kernel %endif -%define_rel 4 +%define_rel 5 Summary: DXR3 and H+ driver Summary(pl): Sterowniki dla DXR3 i H+ Name: em8300 @@ -277,6 +277,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.24.2.2.2.1 2006/04/06 20:54:38 hawk +- release 5 + Revision 1.24.2.2 2005/03/18 10:44:37 havner - rel 4 CVS-web: http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.24.2.2r2=1.24.2.2.2.1f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: em8300.spec - kernel modules won't build on sparc32, no I2C...
Author: hawk Date: Fri Apr 7 06:37:48 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- kernel modules won't build on sparc32, no I2C in kernel
Files affected:
SPECS:
em8300.spec (1.41 - 1.42)
Diffs:
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.41 SPECS/em8300.spec:1.42
--- SPECS/em8300.spec:1.41 Fri Apr 7 01:41:07 2006
+++ SPECS/em8300.spec Fri Apr 7 08:37:43 2006
@@ -9,6 +9,11 @@
%bcond_without userspace # don't build userspace tools
%bcond_withverbose # verbose build (V=1)
+%ifarch sparc
+# kernel modules won't build on sparc32, no I2C in kernel
+%undefine with_kernel
+%endif
+
%if %{without kernel}
%undefine with_dist_kernel
%endif
@@ -17,7 +22,7 @@
Summary(pl): Sterowniki dla DXR3 i H+
Name: em8300
Version: 0.15.2
-Release: 1
+Release: 2
License: GPL
Group: Applications/System
Source0: http://dl.sourceforge.net/dxr3/%{name}-%{version}.tar.gz
@@ -261,6 +266,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.42 2006/04/07 06:37:43 hawk
+- kernel modules won't build on sparc32, no I2C in kernel
+
Revision 1.41 2006/04/06 23:41:07 glen
- cc is used
CVS-web:
http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.41r2=1.42f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: rc-inetd-allow_manual_config.patch (NEW) - patch to allow...
Author: hawk Date: Mon Apr 10 14:17:34 2006 GMT Module: SOURCES Tag: HEAD Log message: - patch to allow administrator disable generating of inetd config Files affected: SOURCES: rc-inetd-allow_manual_config.patch (NONE - 1.1) (NEW) Diffs: Index: SOURCES/rc-inetd-allow_manual_config.patch diff -u /dev/null SOURCES/rc-inetd-allow_manual_config.patch:1.1 --- /dev/null Mon Apr 10 16:17:34 2006 +++ SOURCES/rc-inetd-allow_manual_config.patch Mon Apr 10 16:17:29 2006 @@ -0,0 +1,77 @@ +diff -ur rc-inetd-0.16.orig/rc-inetd rc-inetd-0.16/rc-inetd +--- rc-inetd-0.16.orig/rc-inetd2006-04-10 15:46:49.0 +0200 rc-inetd-0.16/rc-inetd 2006-04-10 15:58:58.028005000 +0200 +@@ -12,10 +12,14 @@ + + . /etc/rc.d/init.d/functions + ++AUTO_CONFIG=yes ++ + # sanity check for /etc/sysconfig/rc-inetd.conf +-# Note: defaults must be read for each service, because they will be replaced ++# Note: defaults must also be read for each service, because they will be replaced + # by config of each service processed. +-if [ ! -f /etc/sysconfig/rc-inetd.conf ]; then ++if [ -f /etc/sysconfig/rc-inetd.conf ]; then ++ . /etc/sysconfig/rc-inetd.conf ++else + nls Error: %s not found /etc/sysconfig/rc-inetd.conf + nls Inet server can't be run. + exit 6 +@@ -147,12 +151,17 @@ + msg_already_running Inet + fi + +- show $(nls Generating %s for %s $CONFIG_FILE $PROCESS_NAME) +- busy +- pre_start_services +- gen_config_file +- DIDPARSE=$? +- deltext;ok ++ if [ $AUTO_CONFIG != no ]; then ++ show $(nls Generating %s for %s $CONFIG_FILE $PROCESS_NAME) ++ busy ++ pre_start_services ++ gen_config_file ++ DIDPARSE=$? ++ deltext;ok ++ else ++ DIDPARSE=1 ++ fi ++ + if [ $DIDPARSE -gt 0 ]; then + msg_starting $PROCESS_NAME + daemon $INETDAEMON $INETDAEMON_ARGS +@@ -180,10 +189,13 @@ + exit 7 + fi + +- show $(nls Generating %s for %s $CONFIG_FILE $PROCESS_NAME) +- busy +- gen_config_file +- deltext; ok ++ if [ $AUTO_CONFIG != no ]; then ++ show $(nls Generating %s for %s $CONFIG_FILE $PROCESS_NAME) ++ busy ++ gen_config_file ++ deltext; ok ++ fi ++ + show $(nls Reload %s service configuration $PROCESS_NAME) + busy + reload_config +diff -ur rc-inetd-0.16.orig/rc-inetd.conf rc-inetd-0.16/rc-inetd.conf +--- rc-inetd-0.16.orig/rc-inetd.conf 2006-04-10 15:51:06.726550500 +0200 rc-inetd-0.16/rc-inetd.conf2006-04-10 15:51:49.989254250 +0200 +@@ -1,5 +1,11 @@ + # This file contains several rc-inetd configuration parameters + ++# Do you want rc-inetd to automagically generate inetd config? ++# Warning: this will overwrite current configuration without asking! ++# Default: yes ++ ++AUTO_CONFIG=yes ++ + # List deny services. List must contain services names separated by space + # or tab. + ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: rc-inetd.spec - allow administrator disable generating of i...
Author: hawk Date: Mon Apr 10 14:18:11 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- allow administrator disable generating of inetd config
- release 5
Files affected:
SPECS:
rc-inetd.spec (1.45 - 1.46)
Diffs:
Index: SPECS/rc-inetd.spec
diff -u SPECS/rc-inetd.spec:1.45 SPECS/rc-inetd.spec:1.46
--- SPECS/rc-inetd.spec:1.45Mon Mar 13 23:13:30 2006
+++ SPECS/rc-inetd.spec Mon Apr 10 16:18:06 2006
@@ -3,13 +3,14 @@
Summary(pl): Skrypty do zarządzania usługami inet
Name: rc-inetd
Version: 0.16
-Release: 4
+Release: 5
License: GPL
Group: Base
Source0: %{name}-%{version}.tar.bz2
# Source0-md5: d0cd4c2d0ec24d4c57f87c183123d3f9
Patch0:%{name}.fix
Patch1:%{name}-noservices.patch
+Patch2:%{name}-allow_manual_config.patch
Requires(post,preun): /sbin/chkconfig
Requires: inetdaemon
Requires: rc-scripts
@@ -27,6 +28,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -61,6 +63,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.46 2006/04/10 14:18:06 hawk
+- allow administrator disable generating of inetd config
+- release 5
+
Revision 1.45 2006/03/13 22:13:30 glen
- use %service
CVS-web:
http://cvs.pld-linux.org/SPECS/rc-inetd.spec?r1=1.45r2=1.46f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: lm_sensors.spec - release 1
Author: hawk Date: Tue Apr 11 09:50:36 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 1
Files affected:
SPECS:
lm_sensors.spec (1.152 - 1.153)
Diffs:
Index: SPECS/lm_sensors.spec
diff -u SPECS/lm_sensors.spec:1.152 SPECS/lm_sensors.spec:1.153
--- SPECS/lm_sensors.spec:1.152 Mon Apr 3 18:49:28 2006
+++ SPECS/lm_sensors.spec Tue Apr 11 11:50:30 2006
@@ -22,7 +22,7 @@
Summary(uk): őÔÉĚŚÔÉ ÄĚŃ ÍĎÎŚÔĎŇÉÎÇŐ ÁĐÁŇÁÔŐŇÉ
Name: lm_sensors
Version: 2.10.0
-%define _rel 0.1
+%define _rel 1
Release: %{_rel}
License: GPL
Group: Applications/System
@@ -410,6 +410,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.153 2006/04/11 09:50:30 hawk
+- release 1
+
Revision 1.152 2006/04/03 16:49:28 qboosh
- enforce SYSFS_SUPPORT, so it works on Linux 2.6.x even if built with 2.4.x
modules
CVS-web:
http://cvs.pld-linux.org/SPECS/lm_sensors.spec?r1=1.152r2=1.153f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kernel24-net-e100.spec, kernel24-net-e1000.spec - Exclusive...
Author: hawk Date: Tue Apr 11 13:29:08 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- ExclusiveArch - we don't have 2.4 kernel on amd64
- release 4
Files affected:
SPECS:
kernel24-net-e100.spec (1.4 - 1.5) , kernel24-net-e1000.spec (1.4 - 1.5)
Diffs:
Index: SPECS/kernel24-net-e100.spec
diff -u SPECS/kernel24-net-e100.spec:1.4 SPECS/kernel24-net-e100.spec:1.5
--- SPECS/kernel24-net-e100.spec:1.4Thu Apr 6 18:36:01 2006
+++ SPECS/kernel24-net-e100.specTue Apr 11 15:28:59 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/100
Name: kernel24-net-%{_orig_name}
Version: 3.5.10
-%define_rel3
+%define_rel4
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -32,6 +32,7 @@
Provides: kernel(e100)
Obsoletes: e100
Obsoletes: linux-net-e100
+ExclusiveArch: %{ix86} sparc sparc64 alpha ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch sparc
@@ -127,6 +128,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2006/04/11 13:28:59 hawk
+- ExclusiveArch - we don't have 2.4 kernel on amd64
+- release 4
+
Revision 1.4 2006/04/06 16:36:01 hawk
- release 3
Index: SPECS/kernel24-net-e1000.spec
diff -u SPECS/kernel24-net-e1000.spec:1.4 SPECS/kernel24-net-e1000.spec:1.5
--- SPECS/kernel24-net-e1000.spec:1.4 Thu Apr 6 18:36:02 2006
+++ SPECS/kernel24-net-e1000.spec Tue Apr 11 15:28:59 2006
@@ -13,7 +13,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/1000
Name: kernel24-net-%{_orig_name}
Version: 7.0.33
-%define_rel3
+%define_rel4
Release: [EMAIL PROTECTED]
License: BSD
Vendor:Intel Corporation
@@ -29,6 +29,7 @@
Provides: kernel24(e1000)
Obsoletes: e1000
Obsoletes: linux-net-e1000
+ExclusiveArch: %{ix86} sparc sparc64 alpha ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -119,6 +120,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2006/04/11 13:28:59 hawk
+- ExclusiveArch - we don't have 2.4 kernel on amd64
+- release 4
+
Revision 1.4 2006/04/06 16:36:02 hawk
- release 3
CVS-web:
http://cvs.pld-linux.org/SPECS/kernel24-net-e100.spec?r1=1.4r2=1.5f=u
http://cvs.pld-linux.org/SPECS/kernel24-net-e1000.spec?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kde-i18n.spec - I'm blind... release 1
Author: hawk Date: Tue Apr 11 18:44:05 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- I'm blind... release 1
Files affected:
SPECS:
kde-i18n.spec (1.151 - 1.152)
Diffs:
Index: SPECS/kde-i18n.spec
diff -u SPECS/kde-i18n.spec:1.151 SPECS/kde-i18n.spec:1.152
--- SPECS/kde-i18n.spec:1.151 Sat Apr 1 19:00:41 2006
+++ SPECS/kde-i18n.spec Tue Apr 11 20:44:00 2006
@@ -13,7 +13,7 @@
Summary(pl): KDE - wsparcie dla wielu języków
Name: kde-i18n
Version: 3.5.2
-Release: 0.2
+Release: 1
License: GPL
Group: X11/Applications
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/kde-i18n/%{name}-af-%{version}.tar.bz2
@@ -1831,6 +1831,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.152 2006/04/11 18:44:00 hawk
+- I'm blind... release 1
+
Revision 1.151 2006/04/01 17:00:41 glen
- unify macros
CVS-web:
http://cvs.pld-linux.org/SPECS/kde-i18n.spec?r1=1.151r2=1.152f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: xine-lib-sparc.patch - fixed compilation on sparc, thx qb...
Author: hawk Date: Wed Apr 12 11:56:13 2006 GMT Module: SOURCES Tag: HEAD Log message: - fixed compilation on sparc, thx qboosh Files affected: SOURCES: xine-lib-sparc.patch (1.6 - 1.7) Diffs: Index: SOURCES/xine-lib-sparc.patch diff -u SOURCES/xine-lib-sparc.patch:1.6 SOURCES/xine-lib-sparc.patch:1.7 --- SOURCES/xine-lib-sparc.patch:1.6Sun Nov 20 01:14:07 2005 +++ SOURCES/xine-lib-sparc.patchWed Apr 12 13:56:08 2006 @@ -51,3 +51,14 @@ + $(LTCOMPILE) -c -o $@ $ -mcpu=ultrasparc +endif + +diff -urbB xine-lib-1.1.0.org/src/libffmpeg/libavcodec/sparc/Makefile.am xine-lib-1.1.0/src/libffmpeg/libavcodec/sparc/Makefile.am +--- xine-lib-1.1.0.org/src/libffmpeg/libavcodec/sparc/Makefile.am 2006-04-12 06:25:56.0 + xine-lib-1.1.0/src/libffmpeg/libavcodec/sparc/Makefile.am 2006-04-12 07:34:04.0 + +@@ -1,6 +1,6 @@ + include $(top_srcdir)/misc/Makefile.common + +-AM_CFLAGS = $(LIBFFMPEG_CFLAGS) ++AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil + ASFLAGS = + + noinst_LTLIBRARIES = libavcodec_sparc.la CVS-web: http://cvs.pld-linux.org/SOURCES/xine-lib-sparc.patch?r1=1.6r2=1.7f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): xine-lib.spec - fixed compilation on sparc - re...
Author: hawk Date: Wed Apr 12 11:57:47 2006 GMT Module: SPECS Tag: AC-branch Log message: - fixed compilation on sparc - release 4 Files affected: SPECS: xine-lib.spec (1.165.2.1 - 1.165.2.2) Diffs: Index: SPECS/xine-lib.spec diff -u SPECS/xine-lib.spec:1.165.2.1 SPECS/xine-lib.spec:1.165.2.2 --- SPECS/xine-lib.spec:1.165.2.1 Mon Apr 10 19:06:22 2006 +++ SPECS/xine-lib.spec Wed Apr 12 13:57:42 2006 @@ -27,7 +27,7 @@ Summary(pt_BR):Xine, um player de video Name: xine-lib Version: 1.1.1 -Release: 3 +Release: 4 Epoch: 2 License: GPL Group: Libraries @@ -997,6 +997,10 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.165.2.2 2006/04/12 11:57:42 hawk +- fixed compilation on sparc +- release 4 + Revision 1.165.2.1 2006/04/10 17:06:22 glen - fix vo_out opengl/xshm permissions, rel 3 CVS-web: http://cvs.pld-linux.org/SPECS/xine-lib.spec?r1=1.165.2.1r2=1.165.2.2f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: gplflash.spec - release 3
Author: hawk Date: Thu Apr 13 06:22:20 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 3
Files affected:
SPECS:
gplflash.spec (1.11 - 1.12)
Diffs:
Index: SPECS/gplflash.spec
diff -u SPECS/gplflash.spec:1.11 SPECS/gplflash.spec:1.12
--- SPECS/gplflash.spec:1.11Tue Sep 6 22:07:08 2005
+++ SPECS/gplflash.spec Thu Apr 13 08:22:14 2006
@@ -3,7 +3,7 @@
Summary(pl): Biblioteka renderująca animacje Flash
Name: gplflash
Version: 0.4.13
-Release: 2.9
+Release: 3
License: GPL
Group: Libraries
Source0: http://dl.sourceforge.net/gplflash/%{name}-%{version}.tar.bz2
@@ -193,6 +193,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.12 2006/04/13 06:22:14 hawk
+- release 3
+
Revision 1.11 2005/09/06 20:07:08 glen
- better migration
CVS-web:
http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.11r2=1.12f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): perl.spec - release 3
Author: hawk Date: Sat Apr 15 20:29:49 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- release 3
Files affected:
SPECS:
perl.spec (1.328.2.1 - 1.328.2.2)
Diffs:
Index: SPECS/perl.spec
diff -u SPECS/perl.spec:1.328.2.1 SPECS/perl.spec:1.328.2.2
--- SPECS/perl.spec:1.328.2.1 Sat Apr 15 15:49:05 2006
+++ SPECS/perl.spec Sat Apr 15 22:29:44 2006
@@ -53,7 +53,7 @@
Summary(zh_CN):Perl ąŕłĚÓďŃÔĄŁ
Name: perl
Version: 5.8.8
-Release: 2%{!?with_threads:_nothr}
+Release: 3%{!?with_threads:_nothr}
Epoch: 1
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
@@ -1425,6 +1425,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.328.2.2 2006/04/15 20:29:44 hawk
+- release 3
+
Revision 1.328.2.1 2006/04/15 13:49:05 sparky
- missing '\'
CVS-web:
http://cvs.pld-linux.org/SPECS/perl.spec?r1=1.328.2.1r2=1.328.2.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: perl_588-27203.patch (NEW) - fix for problem compiling sw...
Author: hawk Date: Sat Apr 15 21:57:33 2006 GMT Module: SOURCES Tag: HEAD Log message: - fix for problem compiling swigged c++ code with perl 5.8.8 Files affected: SOURCES: perl_588-27203.patch (NONE - 1.1) (NEW) Diffs: Index: SOURCES/perl_588-27203.patch diff -u /dev/null SOURCES/perl_588-27203.patch:1.1 --- /dev/null Sat Apr 15 23:57:33 2006 +++ SOURCES/perl_588-27203.patchSat Apr 15 23:57:27 2006 @@ -0,0 +1,36 @@ +Change 27203 by [EMAIL PROTECTED] on 2006/02/16 14:15:53 + + Subject: Problem compiling swigged c++ code with 5.8.8 + From: Merijn Broeren [EMAIL PROTECTED] + Date: Wed, 15 Feb 2006 13:51:49 +0100 + Message-ID: [EMAIL PROTECTED] + +Affected files ... + +... //depot/perl/XSUB.h#103 edit +... //depot/perl/perl.h#665 edit + +Differences ... + +--- perl.h 2006/02/12 00:10:22 19541 perl.h 2006/02/16 22:15:53 19572 +@@ -211,7 +211,7 @@ + #endif + + #ifndef PERL_UNUSED_DECL +-# ifdef HASATTRIBUTE_UNUSED ++# if defined(HASATTRIBUTE_UNUSED) !defined(__cplusplus) + #define PERL_UNUSED_DECL __attribute__unused__ + # else + #define PERL_UNUSED_DECL +--- XSUB.h 2006/02/02 22:24:03 19447 XSUB.h 2006/02/16 22:15:53 19572 +@@ -91,7 +91,7 @@ + #if defined(__CYGWIN__) defined(USE_DYNAMIC_LOADING) + # define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv) + #else +-# ifdef HASATTRIBUTE_UNUSED ++# if defined(HASATTRIBUTE_UNUSED) !defined(__cplusplus) + #define XS(name) void name(pTHX_ CV* cv __attribute__unused__) + # else + #define XS(name) void name(pTHX_ CV* cv) ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): perl.spec - ehh, release 4
Author: hawk Date: Sat Apr 15 21:58:58 2006 GMT
Module: SPECS Tag: AC-branch
Log message:
- ehh, release 4
Files affected:
SPECS:
perl.spec (1.328.2.2 - 1.328.2.3)
Diffs:
Index: SPECS/perl.spec
diff -u SPECS/perl.spec:1.328.2.2 SPECS/perl.spec:1.328.2.3
--- SPECS/perl.spec:1.328.2.2 Sat Apr 15 22:29:44 2006
+++ SPECS/perl.spec Sat Apr 15 23:58:53 2006
@@ -53,7 +53,7 @@
Summary(zh_CN):Perl ąŕłĚÓďŃÔĄŁ
Name: perl
Version: 5.8.8
-Release: 3%{!?with_threads:_nothr}
+Release: 4%{!?with_threads:_nothr}
Epoch: 1
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
@@ -73,6 +73,7 @@
Patch9:%{name}-getgrent.patch
Patch10: %{name}-5.8.7-172396.patch
Patch11: %{name}-5.8.7-CAN-2004-0976.patch
+Patch12: %{name}_588-27203.patch
URL: http://dev.perl.org/perl5/
# required for proper Provides generation (older are not supported by spec)
BuildRequires: rpm-build = 4.3-0.20040107.4
@@ -624,6 +625,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p0
%build
sh Configure \
@@ -1425,6 +1427,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.328.2.3 2006/04/15 21:58:53 hawk
+- ehh, release 4
+
Revision 1.328.2.2 2006/04/15 20:29:44 hawk
- release 3
CVS-web:
http://cvs.pld-linux.org/SPECS/perl.spec?r1=1.328.2.2r2=1.328.2.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: perl.spec - merged changes from AC-branch
Author: hawk Date: Sat Apr 15 22:01:25 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- merged changes from AC-branch
Files affected:
SPECS:
perl.spec (1.329 - 1.330)
Diffs:
Index: SPECS/perl.spec
diff -u SPECS/perl.spec:1.329 SPECS/perl.spec:1.330
--- SPECS/perl.spec:1.329 Sat Apr 15 15:35:07 2006
+++ SPECS/perl.spec Sun Apr 16 00:01:19 2006
@@ -73,6 +73,7 @@
Patch9:%{name}-getgrent.patch
Patch10: %{name}-5.8.7-172396.patch
Patch11: %{name}-5.8.7-CAN-2004-0976.patch
+Patch12: %{name}_588-27203.patch
URL: http://dev.perl.org/perl5/
# required for proper Provides generation (older are not supported by spec)
BuildRequires: rpm-build = 4.3-0.20040107.4
@@ -624,6 +625,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p0
%build
sh Configure \
@@ -1425,6 +1427,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.330 2006/04/15 22:01:19 hawk
+- merged changes from AC-branch
+
Revision 1.329 2006/04/15 13:35:07 sparky
- missing '\'
CVS-web:
http://cvs.pld-linux.org/SPECS/perl.spec?r1=1.329r2=1.330f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: ImageMagick.spec - updated to 6.2.6-8
Author: hawk Date: Sat Apr 15 22:03:37 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 6.2.6-8
Files affected:
SPECS:
ImageMagick.spec (1.233 - 1.234)
Diffs:
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.233 SPECS/ImageMagick.spec:1.234
--- SPECS/ImageMagick.spec:1.233Wed Mar 15 20:07:51 2006
+++ SPECS/ImageMagick.spec Sun Apr 16 00:03:32 2006
@@ -10,7 +10,7 @@
#
%include /usr/lib/rpm/macros.perl
%definever 6.2.6
-%definepver0
+%definepver8
%defineQuantumDepth16
Summary: Image display, conversion, and manipulation under X
Summary(de): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -28,7 +28,7 @@
License: Apache-like
Group: X11/Applications/Graphics
Source0:
http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: 4ff40a92bba825d8cb9447ca454698a0
+# Source0-md5: 20728cfc1920843cc5758937f07fb562
#Source0: http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
Patch0:%{name}-libpath.patch
Patch1:%{name}-ac.patch
@@ -960,6 +960,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.234 2006/04/15 22:03:32 hawk
+- updated to 6.2.6-8
+
Revision 1.233 2006/03/15 19:07:51 qboosh
- added link patch to remove unnecessary libXt and libSM deps
CVS-web:
http://cvs.pld-linux.org/SPECS/ImageMagick.spec?r1=1.233r2=1.234f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): perl.spec - added more info to previous commit log
Author: hawk Date: Sat Apr 15 22:13:34 2006 GMT Module: SPECS Tag: AC-branch Log message: - added more info to previous commit log Files affected: SPECS: perl.spec (1.328.2.3 - 1.328.2.4) Diffs: Index: SPECS/perl.spec diff -u SPECS/perl.spec:1.328.2.3 SPECS/perl.spec:1.328.2.4 --- SPECS/perl.spec:1.328.2.3 Sat Apr 15 23:58:53 2006 +++ SPECS/perl.spec Sun Apr 16 00:13:29 2006 @@ -1427,8 +1427,11 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.328.2.4 2006/04/15 22:13:29 hawk +- added more info to previous commit log + Revision 1.328.2.3 2006/04/15 21:58:53 hawk -- ehh, release 4 +- ehh, release 4, added fix for problem compiling swigged c++ code Revision 1.328.2.2 2006/04/15 20:29:44 hawk - release 3 CVS-web: http://cvs.pld-linux.org/SPECS/perl.spec?r1=1.328.2.3r2=1.328.2.4f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLDWWW: hawk
Author: hawk Date: Sun Apr 16 12:16:40 2006 GMT Module: PLDWWW URL: http://www.pld-linux.org/hawk Log message: Page affected: hawk Diffs: Email: [[MailTo([EMAIL PROTECTED])]] What I'm currently working on (in my free time)? - * installer (bootdisks) for PLD 2.0 (Ac) - * PLD 1.0/1.1 (Ra) + * installer (bootdisks) for PLD 2.0 (Ac) - these are quite usable now, so I'll abandon this project after releasing stable version of Ac + * PLD 1.0/1.1 (Ra) - since I'm Ac RM now, Ra will not be updated anymore and will get an EOL soon + * PLD 2.0 (Ac) * many other things not related with PLD What I'm planning to do if time will allow? - * new bootdisk(s) allowing to install very base PLD (but not new installer), w/o wizards and automation, maybe it should be called Prowizorka V2. + * new bootdisk(s) allowing to install very base PLD (but not new installer), w/o wizards and automation, see [http://hawk.jogger.pl/2006/03/10/prowizorka-v2/] for more details (page is in polish only, sorry). - Any questions about above things? Feel free to mail me. Suggestions are welcome too. If you want to know more about me, you may try to visit [http://hawk.jogger.pl/], but don't expect some interesting content there. I'm rather boring person. + Any questions about above things? Feel free to mail me. Suggestions are welcome too. If you want to know more about me and you can read polish, you may try to visit [http://hawk.jogger.pl/], but don't expect some interesting content there. I think I'm rather boring person ;-) - List of specs that I usually monitor for changes/updates etc (in my free time). Of course that doesn't mean that I don't touch other specs. This list should be rather treated like Hawk's favourite specs :) - * amavisd-new.spec - * apache1.spec - * apache.spec - * bind.spec - * bircd.spec - * busybox.spec - * clamav.spec - * cvs.spec - * dhcp.spec - * freetds.spec - * i2c.spec - * Image``Magick.spec - * imap.spec - * ircd.spec - * jfsutils - * kernel24.spec - * mozilla.spec - * mrtg.spec - * ncftp.spec - * nss_ldap.spec - * openssh.spec - * openssl.spec (for own purposes/usage only) - * pam-pam_ldap.spec - * parted.spec (for installer mainly) - * php4.spec - * phpMyAdmin.spec - * php.spec - * phpPgAdmin.spec - * poldek.spec (for installer only) - * postfix.spec - * postgrey.spec - * proftpd.spec - * reiserfsprogs.spec - * spamassassin.spec - * squid.spec - * syslinux.spec (for installer only) - * syslog-ng.spec - * whois.spec - * xfsprogs.spec - * xpdf.spec - - Want to have any of them updated/modified/patched but don't have RW? Drop me an e-mail. There is always a chance that I'll make required changes. Exceptions are described in brackets. - I cannot guarantee that: - * I'll accept and/or commit required changes - * I'll respond to your e-mail (in acceptable time) - * I'll take care of problems in any of specs listed above - * I'll have something done in specified time + * I'll accept and/or commit changes/patches you've sent to me + * I'll respond to your e-mail in acceptable time (mail me again or jabber me if something is urgent) + * I'll take care of all PLD related problems + * I'll have something done in specified time (I'll do my best, but please understand that I also have life, work etc.) CategoryHomepage ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLDWWW: FrontPage
Author: hawk Date: Sun Apr 16 12:28:01 2006 GMT Module: PLDWWW URL: http://www.pld-linux.org/FrontPage Log message: Page affected: FrontPage Diffs: === 23 March 2006 PLD Linux 2.0 ISO RC1 === - The PLD Linux Distribution team announces the release of PLD Linux 2.0 RC1 isos, ftp resources contain 9 CD (for i386, i586, i686, athlon, amd64 and ppc), miniiso (for i386, i586, i686 and athlon), DVD (for i686, amd64, ppc). + The PLD Linux Distribution team announces the release of PLD Linux 2.0 RC1 isos. Ftp resources contain 11 CDs for each architecture (i386, i586, i686, athlon, amd64 and ppc), miniiso (for i386, i586, i686 and athlon), DVD (for i686, amd64, ppc) and 14 CDs or 2 DVDs of source rpm packages. === 29 October 2005 Site back up === After a (too) long period of downtime, our web site is again available. As usual, we had a machine failure. Unfortunately our backups aren't as fresh as they should be, so some pages might not be up to date (we'll take care of that ASAP). Also it appears that there might be some minor glitches here and there, so if the site reports any errors (especially when committing new changes), please report them to mmazur /at/ pld-linux.org. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: ians.spec - release 2
Author: hawk Date: Wed Apr 19 15:31:08 2006 GMT Module: SPECS Tag: HEAD Log message: - release 2 Files affected: SPECS: ians.spec (1.60 - 1.61) Diffs: Index: SPECS/ians.spec diff -u SPECS/ians.spec:1.60 SPECS/ians.spec:1.61 --- SPECS/ians.spec:1.60Sat Feb 11 17:37:03 2006 +++ SPECS/ians.spec Wed Apr 19 17:31:02 2006 @@ -4,7 +4,7 @@ %bcond_without dist_kernel # without distribution kernel # %define _kernelsrcdir /usr/src/linux-2.4 -%define_rel1 +%define_rel2 Summary: IANS utility for Intel(R) PRO/100 Summary(pl): Narzędzie IANS do karty Intel(R) PRO/100 Name: ians @@ -150,6 +150,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.61 2006/04/19 15:31:02 hawk +- release 2 + Revision 1.60 2006/02/11 16:37:03 marcus - fix smp module CVS-web: http://cvs.pld-linux.org/SPECS/ians.spec?r1=1.60r2=1.61f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: koffice.spec - release 2
Author: hawk Date: Wed Apr 19 15:43:02 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- release 2
Files affected:
SPECS:
koffice.spec (1.149 - 1.150)
Diffs:
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.149 SPECS/koffice.spec:1.150
--- SPECS/koffice.spec:1.149Wed Apr 19 14:24:42 2006
+++ SPECS/koffice.spec Wed Apr 19 17:42:57 2006
@@ -13,7 +13,7 @@
Summary(zh_CN):KDE ľÄ°ěšŤÓŚÓĂČíźţźŻĄŁ
Name: koffice
Version: %{_ver}
-Release: 1
+Release: 2
Epoch: 5
License: GPL/LGPL
Group: X11/Applications
@@ -954,6 +954,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.150 2006/04/19 15:42:57 hawk
+- release 2
+
Revision 1.149 2006/04/19 12:24:42 charles
- fixed -kplato and -kugar files
CVS-web:
http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.149r2=1.150f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: abiword.spec - BR libgoffice-devel not libgoffice (or build...
Author: hawk Date: Thu Apr 20 15:10:50 2006 GMT Module: SPECS Tag: HEAD Log message: - BR libgoffice-devel not libgoffice (or build will fail) - release 2 Files affected: SPECS: abiword.spec (1.118 - 1.119) Diffs: Index: SPECS/abiword.spec diff -u SPECS/abiword.spec:1.118 SPECS/abiword.spec:1.119 --- SPECS/abiword.spec:1.118Wed Apr 19 21:00:38 2006 +++ SPECS/abiword.spec Thu Apr 20 17:10:45 2006 @@ -11,7 +11,7 @@ Summary(pl): Wieloplatformowy procesor tekstu Name: abiword Version: 2.4.4 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: X11/Applications @@ -44,7 +44,7 @@ BuildRequires: libgnomeprintui-devel = 2.2.1.3-2 BuildRequires: libgnomeprint-devel = 2.2.1 BuildRequires: libgnomeui-devel = 2.2.0 -BuildRequires: libgoffice = 0.1.0 +BuildRequires: libgoffice-devel = 0.1.0 BuildRequires: libgsf-devel = 1.12.1 BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -984,6 +984,10 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.119 2006/04/20 15:10:45 hawk +- BR libgoffice-devel not libgoffice (or build will fail) +- release 2 + Revision 1.118 2006/04/19 19:00:38 freetz - update libgoffice requirement (at least 0.1.0) CVS-web: http://cvs.pld-linux.org/SPECS/abiword.spec?r1=1.118r2=1.119f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: svgalib24.spec - release 2
Author: hawk Date: Fri Apr 21 20:51:20 2006 GMT Module: SPECS Tag: HEAD Log message: - release 2 Files affected: SPECS: svgalib24.spec (1.3 - 1.4) Diffs: Index: SPECS/svgalib24.spec diff -u SPECS/svgalib24.spec:1.3 SPECS/svgalib24.spec:1.4 --- SPECS/svgalib24.spec:1.3Wed Apr 12 14:15:40 2006 +++ SPECS/svgalib24.specFri Apr 21 22:51:15 2006 @@ -12,7 +12,7 @@ %define_kernelsrcdir /usr/src/linux-2.4 %definekernel260 %definek24 24 -%define_rel1 +%define_rel2 Summary: Library for full screen [S]VGA graphics Summary(de): Library für Vollbildschirm-[S]VGA-Grafiken Summary(es): Biblioteca para gráficos en pantalla llena [S]VGA @@ -489,6 +489,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.4 2006/04/21 20:51:15 hawk +- release 2 + Revision 1.3 2006/04/12 12:15:40 glen - add kernel epoch, adapterized CVS-web: http://cvs.pld-linux.org/SPECS/svgalib24.spec?r1=1.3r2=1.4f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: NVIDIA_kernel-1.0-7174-1386866.diff (NEW) - patch for bug...
Author: hawk Date: Fri Mar 3 17:15:44 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch for bug in kernel = 2.6.11 implementation of the global_flush_tlb()
kernel interface that can lead to severe stability problems in
combination with the NVIDIA Linux/x86-64 graphics driver and/or other
drivers relying on the change_page_attr()/global_flush_tlb() kernel
interfaces
Files affected:
SOURCES:
NVIDIA_kernel-1.0-7174-1386866.diff (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/NVIDIA_kernel-1.0-7174-1386866.diff
diff -u /dev/null SOURCES/NVIDIA_kernel-1.0-7174-1386866.diff:1.1
--- /dev/null Fri Mar 3 18:15:44 2006
+++ SOURCES/NVIDIA_kernel-1.0-7174-1386866.diff Fri Mar 3 18:15:39 2006
@@ -0,0 +1,72 @@
+diff -ru usr/src/nv/nv-vm.c usr/src/nv.1386866/nv-vm.c
+--- usr/src/nv/nv-vm.c 2005-03-22 16:19:09.0 +0100
usr/src/nv.1386866/nv-vm.c 2005-10-11 19:33:24.821108608 +0200
+@@ -58,26 +58,57 @@
+ * conflicts. we try to rely on the kernel's provided interfaces when
possible,
+ * but need additional flushing on earlier kernels.
+ */
+-#if defined(KERNEL_2_4)
+-/* wrap CACHE_FLUSH so we can pass it to smp_call_function */
+-static void cache_flush(void *p)
+-{
+-CACHE_FLUSH();
+-}
+-#endif
+-
+ /*
+ * 2.4 kernels handle flushing in the change_page_attr() call, but kernels
+ * earlier than 2.4.27 don't flush on cpus that support Self Snoop, so we
+ * manually flush on these kernels (actually, we go ahead and flush on all
+ * 2.4 kernels, as it's possible some others may be missing this fix and
+ * we'd prefer to be a little slower flushing caches than hanging the
+- * system. 2.6 kernels split the flushing out to a seperate call,
+- * global_flush_tlb(), so we rely on that.
++ * system.
++ * 2.6 kernels split the flushing out to a seperate call,
++ * global_flush_tlb(), so we rely on that. however, there are some 2.6
++ * x86_64 kernels that do not properly flush. for now, we'll flush on all
++ * potential kernels, as it's slightly slower, but safer.
+ */
++#if defined(KERNEL_2_4) || (defined(KERNEL_2_6) defined(NVCPU_X86_64))
++#define NV_CPA_NEEDS_FLUSHING 1
++#endif
++
++#if defined(NV_CPA_NEEDS_FLUSHING)
++static void cache_flush(void *p)
++{
++unsigned long reg0, reg1;
++
++CACHE_FLUSH();
++
++// flush global TLBs
++#if defined (NVCPU_X86)
++asm volatile(movl %%cr4, %0; \n
++ andl $~0x80, %0; \n
++ movl %0, %%cr4; \n
++ movl %%cr3, %1; \n
++ movl %1, %%cr3; \n
++ orl $0x80, %0; \n
++ movl %0, %%cr4; \n
++ : =r (reg0), =r (reg1)
++ : : memory);
++#else
++asm volatile(movq %%cr4, %0; \n
++ andq $~0x80, %0; \n
++ movq %0, %%cr4; \n
++ movq %%cr3, %1; \n
++ movq %1, %%cr3; \n
++ orq $0x80, %0; \n
++ movq %0, %%cr4; \n
++ : =r (reg0), =r (reg1)
++ : : memory);
++#endif
++}
++#endif
++
+ static void nv_flush_caches(void)
+ {
+-#if defined(KERNEL_2_4)
++#if defined(NV_CPA_NEEDS_FLUSHING)
+ #ifdef CONFIG_SMP
+ smp_call_function(cache_flush, NULL, 1, 1);
+ #endif
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: NVIDIA_kernel-1.0-7174-1258475.diff (NEW) - patch that ad...
Author: hawk Date: Fri Mar 3 17:16:39 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch that addresses an X startup problem on Linux/x86-64 em64t systems
with 4GB of RAM
Files affected:
SOURCES:
NVIDIA_kernel-1.0-7174-1258475.diff (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/NVIDIA_kernel-1.0-7174-1258475.diff
diff -u /dev/null SOURCES/NVIDIA_kernel-1.0-7174-1258475.diff:1.1
--- /dev/null Fri Mar 3 18:16:39 2006
+++ SOURCES/NVIDIA_kernel-1.0-7174-1258475.diff Fri Mar 3 18:16:34 2006
@@ -0,0 +1,121 @@
+diff -ru usr/src/nv/nv-linux.h usr/src/nv.1258475/nv-linux.h
+--- usr/src/nv/nv-linux.h 2005-03-22 16:19:09.0 +0100
usr/src/nv.1258475/nv-linux.h 2005-05-05 19:06:45.237118320 +0200
+@@ -200,7 +200,6 @@
+ */
+ #if defined(CONFIG_SWIOTLB)
+ #define NV_SWIOTLB 1
+-#define NV_SWIOTLB_MAX_RETRIES 16
+ extern int nv_swiotlb;
+ #endif
+
+@@ -1053,6 +1052,31 @@
+ }
+
+ #if defined(NV_SG_MAP_BUFFERS)
++
++static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
++{
++int ret;
++#if defined(KERNEL_2_6) defined(CONFIG_SWIOTLB)
++if (swiotlb)
++ret = swiotlb_map_sg(dev-dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++else
++#endif
++ret = pci_map_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++return ret;
++}
++
++static inline void nv_unmap_sg(struct pci_dev *dev, struct scatterlist *sg)
++{
++#if defined(KERNEL_2_6) defined(CONFIG_SWIOTLB)
++if (swiotlb)
++swiotlb_unmap_sg(dev-dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++else
++#endif
++pci_unmap_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++}
++
++#define NV_MAP_SG_MAX_RETRIES 16
++
+ static inline int nv_sg_map_buffer(
+ struct pci_dev *dev,
+ nv_pte_t **page_list,
+@@ -1067,50 +1091,42 @@
+ sg_ptr-offset = (unsigned long)base ~PAGE_MASK;
+ sg_ptr-length = num_pages * PAGE_SIZE;
+
+-#if defined(NV_SWIOTLB)
+-i = NV_SWIOTLB_MAX_RETRIES;
++i = NV_MAP_SG_MAX_RETRIES;
+ do {
+-if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
++if (nv_map_sg(dev, sg_ptr) == 0)
+ return 1;
+
+ if (sg_ptr-dma_address ~PAGE_MASK)
+ {
+ struct scatterlist sg_tmp;
+-pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
++nv_unmap_sg(dev, sg_ptr);
+
+ memset(sg_tmp, 0, sizeof(struct scatterlist));
+ sg_tmp.page = sg_ptr-page;
+ sg_tmp.offset = sg_ptr-offset;
+ sg_tmp.length = 2048;
+
+-if (pci_map_sg(dev, sg_tmp, 1, PCI_DMA_BIDIRECTIONAL) == 0)
++if (nv_map_sg(dev, sg_tmp) == 0)
+ return 1;
+
+-if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
++if (nv_map_sg(dev, sg_ptr) == 0)
+ {
+-pci_unmap_sg(dev, sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
++nv_unmap_sg(dev, sg_tmp);
+ return 1;
+ }
+
+-pci_unmap_sg(dev, sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
++nv_unmap_sg(dev, sg_tmp);
+ }
+ } while (i-- sg_ptr-dma_address ~PAGE_MASK);
+-#else
+-if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
+-{
+-return 1;
+-}
+-#endif
+
+ if (sg_ptr-dma_address ~PAGE_MASK)
+ {
+ nv_printf(NV_DBG_ERRORS,
+ NVRM: VM: nv_sg_map_buffer: failed to obtain aligned mapping\n);
+-pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
++nv_unmap_sg(dev, sg_ptr);
+ return 1;
+ }
+
+-NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(sg_ptr-dma_address);
+
+ // this is a bit of a hack to make contiguous allocations easier to handle
+ // nv_sg_load below relies on the page_ptr addresses being filed in, as
+@@ -1139,6 +1155,9 @@
+ // wire in the new page's addresses, but save the original off to free
later
+ if (nv_swiotlb)
+ {
++// note that we modify our local version, not the sg_ptr version that
++// will be returned to the swiotlb pool
++NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(page_ptr-dma_addr);
+ page_ptr-orig_phys_addr = page_ptr-phys_addr;
+ page_ptr-phys_addr = page_ptr-dma_addr;
+ page_ptr-orig_virt_addr = page_ptr-virt_addr;
+@@ -1171,7 +1190,7 @@
+
+ if (page_ptr-dma_addr != page_ptr-phys_addr)
+ {
+-pci_unmap_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL);
++nv_unmap_sg(dev, sg_ptr);
+ page_ptr-dma_addr = 0;
+ }
+ }
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: NVIDIA_kernel-1.0-7174-1296092.diff (NEW) - patch that ad...
Author: hawk Date: Fri Mar 3 17:17:27 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch that addresses a module load failure with Linux 2.6.12-rc and more
recent Linux kernels
Files affected:
SOURCES:
NVIDIA_kernel-1.0-7174-1296092.diff (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/NVIDIA_kernel-1.0-7174-1296092.diff
diff -u /dev/null SOURCES/NVIDIA_kernel-1.0-7174-1296092.diff:1.1
--- /dev/null Fri Mar 3 18:17:27 2006
+++ SOURCES/NVIDIA_kernel-1.0-7174-1296092.diff Fri Mar 3 18:17:22 2006
@@ -0,0 +1,97 @@
+diff -ru usr/src/nv/nv-linux.h usr/src/nv.1296092/nv-linux.h
+--- usr/src/nv/nv-linux.h 2005-03-22 16:19:09.0 +0100
usr/src/nv.1296092/nv-linux.h 2005-06-14 16:55:30.416687848 +0200
+@@ -76,7 +76,7 @@
+ #include asm/page.h /* PAGE_OFFSET */
+ #include asm/pgtable.h/* pte bit definitions */
+
+-#if defined(NVCPU_X86_64) defined(KERNEL_2_6)
++#if defined(NVCPU_X86_64) defined(KERNEL_2_6)
!defined(HAVE_COMPAT_IOCTL)
+ #include linux/syscalls.h /* sys_ioctl() */
+ #include linux/ioctl32.h /* register_ioctl32_conversion()*/
+ #endif
+diff -ru usr/src/nv/nv.c usr/src/nv.1296092/nv.c
+--- usr/src/nv/nv.c2005-03-22 16:19:09.0 +0100
usr/src/nv.1296092/nv.c2005-06-14 16:55:16.745766144 +0200
+@@ -153,6 +153,7 @@
+ int nv_kern_mmap(struct file *, struct vm_area_struct *);
+ unsigned int nv_kern_poll(struct file *, poll_table *);
+ int nv_kern_ioctl(struct inode *, struct file *, unsigned int,
unsigned long);
++long nv_kern_compat_ioctl(struct file *, unsigned int, unsigned
long);
+ void nv_kern_isr_bh(unsigned long);
+ irqreturn_t nv_kern_isr(int, void *, struct pt_regs *);
+ void nv_kern_rc_timer(unsigned long);
+@@ -209,6 +210,9 @@
+ .owner = THIS_MODULE,
+ .poll = nv_kern_poll,
+ .ioctl = nv_kern_ioctl,
++#if defined(NVCPU_X86_64) defined(HAVE_COMPAT_IOCTL)
++.compat_ioctl = nv_kern_compat_ioctl,
++#endif
+ .mmap = nv_kern_mmap,
+ .open = nv_kern_open,
+ .release = nv_kern_close,
+@@ -993,8 +997,10 @@
+ inter_module_register(nv_linux_devices, THIS_MODULE, nv_linux_devices);
+ #endif
+
++#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
!defined(HAVE_COMPAT_IOCTL)
+ /* Register ioctl conversions for 32 bit clients */
+ rm_register_ioctl_conversions();
++#endif
+
+ #ifdef NV_SWIOTLB
+ // may need a better test than this eventually
+@@ -1154,8 +1160,10 @@
+ #endif
+ }
+
++#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
!defined(HAVE_COMPAT_IOCTL)
+ /* Unregister ioctl conversions for 32 bit clients */
+ rm_unregister_ioctl_conversions();
++#endif
+
+ #if defined(NV_BUILD_NV_PAT_SUPPORT)
+ if (nv_pat_enabled)
+@@ -1930,6 +1938,15 @@
+ return status;
+ }
+
++long nv_kern_compat_ioctl(
++struct file *file,
++unsigned int cmd,
++unsigned long i_arg
++)
++{
++return nv_kern_ioctl(file-f_dentry-d_inode, file, cmd, i_arg);
++}
++
+ /*
+ * driver receives an interrupt
+ *if someone waiting, then hand it off.
+diff -ru usr/src/nv/os-interface.c usr/src/nv.1296092/os-interface.c
+--- usr/src/nv/os-interface.c 2005-03-22 16:19:09.0 +0100
usr/src/nv.1296092/os-interface.c 2005-06-14 16:55:21.366063752 +0200
+@@ -1227,18 +1227,18 @@
+
+ void NV_API_CALL os_register_ioctl32_conversion(U032 cmd, U032 size)
+ {
+-#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
++#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
!defined(HAVE_COMPAT_IOCTL)
+ unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
+ register_ioctl32_conversion(request, (void *)sys_ioctl);
+-#endif /* NVCPU_X86_64 */
++#endif
+ }
+
+ void NV_API_CALL os_unregister_ioctl32_conversion(U032 cmd, U032 size)
+ {
+-#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
++#if defined(NVCPU_X86_64) defined(CONFIG_IA32_EMULATION)
!defined(HAVE_COMPAT_IOCTL)
+ unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
+ unregister_ioctl32_conversion(request);
+-#endif /* NVCPU_X86_64 */
++#endif
+ }
+
+ BOOL NV_API_CALL os_pat_supported(void)
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: NVIDIA_kernel-1.0-7174-1361053.diff (NEW) - patch that ad...
Author: hawk Date: Fri Mar 3 17:18:24 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch that addresses a kernel interaction problem on Linux/x86-64 systems
that either do not support the no-execute page protection feature or on
which this feature has been disabled by the SBIOS
Files affected:
SOURCES:
NVIDIA_kernel-1.0-7174-1361053.diff (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/NVIDIA_kernel-1.0-7174-1361053.diff
diff -u /dev/null SOURCES/NVIDIA_kernel-1.0-7174-1361053.diff:1.1
--- /dev/null Fri Mar 3 18:18:24 2006
+++ SOURCES/NVIDIA_kernel-1.0-7174-1361053.diff Fri Mar 3 18:18:19 2006
@@ -0,0 +1,98 @@
+diff -ru usr/src/nv/nv-linux.h usr/src/nv.1361053/nv-linux.h
+--- usr/src/nv/nv-linux.h 2005-03-22 16:19:09.0 +0100
usr/src/nv.1361053/nv-linux.h 2005-10-11 19:01:57.647002680 +0200
+@@ -1018,15 +1018,50 @@
+ #define NV_CHANGE_PAGE_ATTR_BUG_PRESENT 1
+ #endif
+
++#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
++/*
++ * On Linux/x86-64 (and recent Linux/x86) kernels, the PAGE_KERNEL
++ * and PAGE_KERNEL_NOCACHE protection bit masks include _PAGE_NX
++ * to indicate that the no-execute protection page feature is used
++ * for the page in question.
++ *
++ * We need to be careful to mask out _PAGE_NX when the host system
++ * doesn't support this feature or when it's disabled: the kernel
++ * may not do this in its implementation of the change_page_attr()
++ * interface.
++ */
++#ifndef X86_FEATURE_NX
++#define X86_FEATURE_NX (1*32+20)
++#endif
++#ifndef boot_cpu_has
++#define boot_cpu_has(x) test_bit(x, boot_cpu_data.x86_capability)
++#endif
++#ifndef MSR_EFER
++#define MSR_EFER 0xc080
++#endif
++#ifndef EFER_NX
++#define EFER_NX (1 11)
++#endif
++#ifndef _PAGE_NX
++#define _PAGE_NX ((NvU64)1 63)
++#endif
++extern NvU64 __nv_supported_pte_mask;
++#endif
++
+ #if defined(NV_CHANGE_PAGE_ATTR_PRESENT)
!defined(NV_CHANGE_PAGE_ATTR_BUG_PRESENT)
+ static inline void NV_SET_PAGE_ATTRIB_UNCACHED(nv_pte_t *page_ptr)
+ {
+ struct page *page = virt_to_page(__va(page_ptr-phys_addr));
+-change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
++pgprot_t prot = PAGE_KERNEL_NOCACHE;
++#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
++pgprot_val(prot) = __nv_supported_pte_mask;
++#endif
++change_page_attr(page, 1, prot);
+ }
+ static inline void NV_SET_PAGE_ATTRIB_CACHED(nv_pte_t *page_ptr)
+ {
+ struct page *page = virt_to_page(__va(page_ptr-phys_addr));
++pgprot_t prot = PAGE_KERNEL;
+ #ifdef CONFIG_SWIOTLB
+ if (page_ptr-orig_phys_addr)
+ {
+@@ -1034,7 +1069,10 @@
+ os_dbg_breakpoint();
+ }
+ #endif
+-change_page_attr(page, 1, PAGE_KERNEL);
++#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
++pgprot_val(prot) = __nv_supported_pte_mask;
++#endif
++change_page_attr(page, 1, prot);
+ }
+ #else
+ #define NV_SET_PAGE_ATTRIB_UNCACHED(page_list)
+diff -ru usr/src/nv/nv.c usr/src/nv.1361053/nv.c
+--- usr/src/nv/nv.c2005-03-22 16:19:09.0 +0100
usr/src/nv.1361053/nv.c2005-10-11 18:59:20.347915776 +0200
+@@ -38,6 +38,10 @@
+ static int nv_disable_pat = 0;
+ NV_MODULE_PARAMETER(nv_disable_pat);
+
++#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
++NvU64 __nv_supported_pte_mask = ~_PAGE_NX;
++#endif
++
+ /*
+ * And one for the control device
+ */
+@@ -1024,6 +1028,16 @@
+ __nv_enable_pat_support();
+ }
+ #endif
++
++#if defined(NVCPU_X86_64) || (defined(NVCPU_X86) defined(CONFIG_X86_PAE))
++if (boot_cpu_has(X86_FEATURE_NX))
++{
++U032 __eax, __edx;
++rdmsr(MSR_EFER, __eax, __edx);
++if ((__eax EFER_NX) != 0)
++__nv_supported_pte_mask |= _PAGE_NX;
++}
++#endif
+
+ return 0;
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: NVIDIA_kernel-1.0-7174-1321905.diff (NEW) - patch that wo...
Author: hawk Date: Fri Mar 3 17:19:25 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch that works around a bug in some Linux kernels' implementation of
the change_page_attr() interface function with respect to the handling of
large pages and the no-execute page protection feature. This bug can lead
to system reboots
Files affected:
SOURCES:
NVIDIA_kernel-1.0-7174-1321905.diff (NONE - 1.1) (NEW)
Diffs:
Index: SOURCES/NVIDIA_kernel-1.0-7174-1321905.diff
diff -u /dev/null SOURCES/NVIDIA_kernel-1.0-7174-1321905.diff:1.1
--- /dev/null Fri Mar 3 18:19:25 2006
+++ SOURCES/NVIDIA_kernel-1.0-7174-1321905.diff Fri Mar 3 18:19:20 2006
@@ -0,0 +1,24 @@
+diff -ru usr/src/nv/nv-vm.c usr/src/nv.1321905/nv-vm.c
+--- usr/src/nv/nv-vm.c 2005-03-22 16:19:09.0 +0100
usr/src/nv.1321905/nv-vm.c 2005-10-23 15:43:12.860170440 +0200
+@@ -248,6 +248,20 @@
+ /* lock the page for dma purposes */
+ SetPageReserved(NV_GET_PAGE_STRUCT(phys_addr));
+
++#if defined(_PAGE_NX)
++if ((_PAGE_NX pgprot_val(PAGE_KERNEL)) != 0 phys_addr
0x40) {
++// Until a bug in change_page_attr() is fixed
++// we avoid pages with physaddr 0x40,
++// since splitting jumbo mappings results
++// in kernel pages being mapped as PAGE_KERNEL, which
++// may include _PAGE_NX, effectively making much of the
++// kernel code non-executable.
++nv_printf(NV_DBG_MEMINFO, NVRM: nv_vm_malloc discarding page
@%08x\n, phys_addr);
++--i;
++continue;
++}
++#endif
++
+ page_ptr = at-page_table[i];
+ page_ptr-phys_addr = phys_addr;
+ page_ptr-virt_addr = virt_addr;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: X11-driver-nvidia-legacy.spec - added bugfixes from http://...
Author: hawk Date: Fri Mar 3 17:21:20 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- added bugfixes from http://www.nvnews.net/vbulletin/showthread.php?t=50150
and http://www.nvnews.net/vbulletin/showthread.php?p=717551
- small cleanup
Files affected:
SPECS:
X11-driver-nvidia-legacy.spec (1.18 - 1.19)
Diffs:
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.18
SPECS/X11-driver-nvidia-legacy.spec:1.19
--- SPECS/X11-driver-nvidia-legacy.spec:1.18Fri Mar 3 02:20:30 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Fri Mar 3 18:21:14 2006
@@ -19,7 +19,7 @@
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old
GF2/Quadro
Name: X11-driver-nvidia-legacy
Version: %{_nv_ver}.%{_nv_rel}
-Release: %{_rel}.1
+Release: %{_rel}.2
License: nVidia Binary
Group: X11
# why not pkg0!?
@@ -31,7 +31,11 @@
Patch1:%{name}-GL.patch
Patch2:%{name}-conftest.patch
Patch3:%{name}-verbose.patch
-#Patch4: %{name}-nv_map_sg.patch
+Patch4:NVIDIA_kernel-1.0-7174-1258475.diff
+Patch5:NVIDIA_kernel-1.0-7174-1296092.diff
+Patch6:NVIDIA_kernel-1.0-7174-1321905.diff
+Patch7:NVIDIA_kernel-1.0-7174-1361053.diff
+Patch8:NVIDIA_kernel-1.0-7174-1386866.diff
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
BuildRequires: %{kgcc_package}
@@ -188,7 +192,11 @@
%if %{with verbose}
%patch3 -p1
%endif
-#%patch4 -p1
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
@@ -357,6 +365,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.19 2006/03/03 17:21:14 hawk
+- added bugfixes from http://www.nvnews.net/vbulletin/showthread.php?t=50150
+ and http://www.nvnews.net/vbulletin/showthread.php?p=717551
+- small cleanup
+
Revision 1.18 2006/03/03 01:20:30 wolvverine
- changes from X11-driver-nvidia.spec
CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.18r2=1.19f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: X11-driver-nvidia-legacy.spec - fixed release numbering
Author: hawk Date: Fri Mar 3 22:13:35 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- fixed release numbering
Files affected:
SPECS:
X11-driver-nvidia-legacy.spec (1.19 - 1.20)
Diffs:
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.19
SPECS/X11-driver-nvidia-legacy.spec:1.20
--- SPECS/X11-driver-nvidia-legacy.spec:1.19Fri Mar 3 18:21:14 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Fri Mar 3 23:13:30 2006
@@ -10,7 +10,7 @@
%define_nv_ver 1.0
%define_nv_rel 7174
%define_min_x116.7.0
-%define_rel6
+%define_rel6.2
#
#
%defineoldname X11-driver-nvidia
@@ -19,7 +19,7 @@
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old
GF2/Quadro
Name: X11-driver-nvidia-legacy
Version: %{_nv_ver}.%{_nv_rel}
-Release: %{_rel}.2
+Release: %{_rel}
License: nVidia Binary
Group: X11
# why not pkg0!?
@@ -365,6 +365,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.20 2006/03/03 22:13:30 hawk
+- fixed release numbering
+
Revision 1.19 2006/03/03 17:21:14 hawk
- added bugfixes from http://www.nvnews.net/vbulletin/showthread.php?t=50150
and http://www.nvnews.net/vbulletin/showthread.php?p=717551
CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.19r2=1.20f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/poldek-iso.priority - started adjusting for...
Author: hawk Date: Sun Mar 12 21:01:45 2006 GMT Module: admin Tag: AC-branch Log message: - started adjusting for current Ac Files affected: admin/ftp: poldek-iso.priority (1.8.2.1 - 1.8.2.2) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.1 admin/ftp/poldek-iso.priority:1.8.2.2 --- admin/ftp/poldek-iso.priority:1.8.2.1 Sun Feb 19 18:36:10 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 12 22:01:40 2006 @@ -1,143 +1,121 @@ # base priority= 0 -# it would be nice ro have package on first CD, but we won't die out of sadness if it won't be = -2 +# +# it would be nice to have package on first CD, +# but we won't die out of sadness if it won't be = -2 +# # package must be on first CD = -5 +# # put package on last CD = 5 # Base system and few most common on first CD -FHS-5 -LPRng -5 -MAKEDEV-5 -SysVinit -5 +# packages required by minimal and base installation types on first CD + acpid -5 anacron-5 apmd -5 autofs*-5 basesystem -5 bash -5 -bdflush-5 -bind -5 -bind-libs -5 bind-utils -5 -busybox-5 -busybox-initrd -5 bzip2 -5 -cdrtools* -5 chkconfig -5 cpio -5 cracklib -5 cracklib-dicts -5 +db -5 dev-5 -dhcp -5 -dhcp-client-5 dhcpcd -5 -dosfstools -5 -dump -5 e2fsprogs -5 eagle-usb -5 -eject -5 elinks -5 -exim -5 +FHS-5 file -5 findutils -5 -firewall-init -5 fix-info-dir -5 ftp-5 geninitrd -5 genromfs -5 gettext-5 glibc -5 +gpm-5 grep -5 +groff -5 grub -5 gzip -5 hc-cron-5 hexedit-5 +hfsprogs -5 info -5 -ipchains -5 -iptables -5 -iptables-init -5 -iptables-ipp2p -5 +iproute2 -5 iptables24 -5 iptables24-init-5 iptables24-ipp2p -5 -iproute2 -5 +iptables -5 +iptables-init -5 +iptables-ipp2p -5 iputils-5 iputils-ping -5 issue -5 -jed-5 jfsutils -5 -joe-5 kbd-5 -klogd -5 less -5 lftp -5 +libstdc++ -5 lilo -5 links -5 login -5 logrotate -5 -logwatch -5 losetup-5 -lslk -5 lsof -5 ltrace -5 lynx -5 mailx -5 +MAKEDEV-5 man-5 man-pages -5 mawk -5 mc -5 mdadm -5 -mdadm-initrd -5 mingetty -5 minicom-5 mktemp -5 modutils -5 mount -5 -mt-st -5 -mtr-5 mutt -5 nc -5 ncftp -5 ncompress -5 net-tools -5 -netcfg-tpsa-5 nmap -5 -nut-5 -nut-client
admin (AC-branch): ftp/poldek-iso.priority - oops!
Author: hawk Date: Sun Mar 12 21:15:59 2006 GMT Module: admin Tag: AC-branch Log message: - oops! Files affected: admin/ftp: poldek-iso.priority (1.8.2.2 - 1.8.2.3) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.2 admin/ftp/poldek-iso.priority:1.8.2.3 --- admin/ftp/poldek-iso.priority:1.8.2.2 Sun Mar 12 22:01:40 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 12 22:15:54 2006 @@ -217,7 +217,7 @@ kernel-video-svgalib_helper-5 kernel-zaptel -5 -# packages needed by server installation type on first CD +# packages needed by server installation type should be on first CD apache -5 apache1-5 @@ -636,7 +636,7 @@ X11-fonts-100dpi-ISO8859-13-3 X11-fonts-100dpi-ISO8859-14-3 X11-fonts-100dpi-ISO8859-15-3 -X11-fonts-100dpi-ISO8859-3 -3 +X11-fonts-100dpi-ISO8859-2 -3 X11-fonts-100dpi-ISO8859-3 -3 X11-fonts-100dpi-ISO8859-4 -3 X11-fonts-100dpi-ISO8859-9 -3 @@ -647,7 +647,7 @@ X11-fonts-75dpi-ISO8859-13 -3 X11-fonts-75dpi-ISO8859-14 -3 X11-fonts-75dpi-ISO8859-15 -3 -X11-fonts-75dpi-ISO8859-3 -3 +X11-fonts-75dpi-ISO8859-2 -3 X11-fonts-75dpi-ISO8859-3 -3 X11-fonts-75dpi-ISO8859-4 -3 X11-fonts-75dpi-ISO8859-9 -3 @@ -659,7 +659,7 @@ X11-fonts-ISO8859-14 -3 X11-fonts-ISO8859-15 -3 X11-fonts-ISO8859-16 -3 -X11-fonts-ISO8859-3-3 +X11-fonts-ISO8859-2-3 X11-fonts-ISO8859-3-3 X11-fonts-ISO8859-4-3 X11-fonts-ISO8859-5-3 CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.2r2=1.8.2.3f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/poldek-iso.priority - priority -5 only for ...
Author: hawk Date: Sun Mar 12 21:20:03 2006 GMT Module: admin Tag: AC-branch Log message: - priority -5 only for packages that really _must_ be on 1st CD Files affected: admin/ftp: poldek-iso.priority (1.8.2.3 - 1.8.2.4) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.3 admin/ftp/poldek-iso.priority:1.8.2.4 --- admin/ftp/poldek-iso.priority:1.8.2.3 Sun Mar 12 22:15:54 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 12 22:19:58 2006 @@ -219,371 +219,371 @@ # packages needed by server installation type should be on first CD -apache -5 -apache1-5 -apache1-apxs -5 -apache1-doc-5 -apache1-errordocs -5 -apache1-index -5 -apache1-mod_access -5 -apache1-mod_actions-5 -apache1-mod_alias -5 -apache1-mod_asis -5 -apache1-mod_auth -5 -apache1-mod_auth_anon -5 -apache1-mod_auth_db-5 -apache1-mod_auth_digest-5 -apache1-mod_autoindex -5 -apache1-mod_cern_meta -5 -apache1-mod_cgi-5 -apache1-mod_define -5 -apache1-mod_digest -5 -apache1-mod_dir-5 -apache1-mod_env-5 -apache1-mod_expires-5 -apache1-mod_headers-5 -apache1-mod_imap -5 -apache1-mod_include-5 -apache1-mod_info -5 -apache1-mod_log_agent -5 -apache1-mod_log_config -5 -apache1-mod_log_forensic -5 -apache1-mod_log_referer-5 -apache1-mod_mime -5 -apache1-mod_mime_magic -5 -apache1-mod_mmap_static-5 -apache1-mod_negotiation-5 -apache1-mod_php-5 -apache1-mod_php4 -5 -apache1-mod_proxy -5 -apache1-mod_rewrite-5 -apache1-mod_setenvif -5 -apache1-mod_speling-5 -apache1-mod_ssl-5 -apache1-mod_status -5 -apache1-mod_sxnet -5 -apache1-mod_unique_id -5 -apache1-mod_userdir-5 -apache1-mod_usertrack -5 -apache1-mod_vhost_alias-5 -apache1-suexec -5 -apache1-tools -5 -apache-apxs-5 -apache-base-5 -apache-cgi_test-5 -apache-dbmtools-5 -apache-doc -5 -apache-errordocs -5 -apache-index -5 -apache-mod_actions -5 -apache-mod_alias -5 -apache-mod_asis-5 -apache-mod_auth-5 -apache-mod_auth_basic -5 -apache-mod_auth_dbm-5 -apache-mod_auth_digest -5 -apache-mod_authn_alias -5 -apache-mod_authn_anon -5 -apache-mod_authn_dbd -5 -apache-mod_authn_dbm -5 -apache-mod_authn_default -5 -apache-mod_authn_file -5 -apache-mod_authnz_ldap -5 -apache-mod_authz_dbm -5 -apache-mod_authz_default -5 -apache-mod_authz_groupfile -5 -apache-mod_authz_host -5 -apache-mod_authz_owner -5 -apache-mod_authz_user -5 -apache-mod_autoindex -5 -apache-mod_cache -5 -apache-mod_case_filter -5 -apache-mod_case_filter_in -5 -apache-mod_cern_meta -5 -apache-mod_cgi -5 -apache-mod_cgid-5 -apache-mod_charset_lite-5 -apache-mod_dav -5 -apache-mod_dbd -5 -apache-mod_deflate -5 -apache-mod_dir -5 -apache-mod_dumpio -5 -apache-mod_echo-5 -apache-mod_env -5 -apache-mod_expires -5 -apache-mod_ext_filter -5 -apache-mod_file_cache -5 -apache-mod_filter -5 -apache-mod_headers -5 -apache-mod_ident -5 -apache-mod_imagemap-5 -apache-mod_include -5 -apache-mod_info-5 -apache-mod_ldap-5 -apache-mod_log_config -5 -apache-mod_log_forensic-5 -apache-mod_logio -5 -apache-mod_mime-5 -apache-mod_mime_magic -5 -apache-mod_negotiation -5 -apache-mod_php -5 -apache-mod_php4-5 -apache-mod_proxy -5 -apache-mod_rewrite -5 -apache-mod_setenvif-5 -apache-mod_speling -5 -apache-mod_ssl -5 -apache-mod_status -5 -apache-mod_unique_id -5 -apache-mod_userdir -5
admin (AC-branch): ftp/poldek-iso.priority - move celesta-* before...
Author: hawk Date: Sun Mar 12 21:43:03 2006 GMT Module: admin Tag: AC-branch Log message: - move celesta-* before FlightGear to save space on CDs 9 and 10 Files affected: admin/ftp: poldek-iso.priority (1.8.2.4 - 1.8.2.5) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.4 admin/ftp/poldek-iso.priority:1.8.2.5 --- admin/ftp/poldek-iso.priority:1.8.2.4 Sun Mar 12 22:19:58 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 12 22:42:58 2006 @@ -1255,8 +1255,8 @@ # too. Split point may switch to some other package when priorities will be # modified. +celestia-* 3 FlightGear 4 -celestia-* 4 # devel and static on last CD CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.4r2=1.8.2.5f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-mini - detect old poldek - small cle...
Author: hawk Date: Sun Mar 12 21:53:38 2006 GMT
Module: admin Tag: AC-branch
Log message:
- detect old poldek
- small cleanup
Files affected:
admin/ftp:
geniso-mini (1.20.2.2 - 1.20.2.3)
Diffs:
Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20.2.2 admin/ftp/geniso-mini:1.20.2.3
--- admin/ftp/geniso-mini:1.20.2.2 Sun Feb 19 23:31:01 2006
+++ admin/ftp/geniso-mini Sun Mar 12 22:53:33 2006
@@ -7,12 +7,11 @@
ROOT=/pld/ftp
PATH=$ROOT/.stat/bin:$PATH; export PATH
-#ARCHLIST=athlon i386 i586 i686
-ARCHLIST=i386
+ARCHLIST=i386 i586 i686 athlon
DIST=2.0
-DATA=20060219
+DATA=20060312
MKISOFSOPT=-quiet
@@ -22,8 +21,8 @@
ISOTARGET=/pld/ftp
-POLDEK=/usr/bin/poldek
#POLDEK=$ROOT/.stat/bin/poldek-$DIST
+POLDEK=/usr/bin/poldek
MKISOFS=/usr/bin/mkisofs
@@ -31,6 +30,11 @@
NAME=Ac
SUBVER=RC1
+POLDEK_OLD=
+if ($POLDEK --version | grep -qE '0\.18\.'); then
+ POLDEK_OLD=yes
+fi
+
pld_info() {
echo
*
@@ -98,7 +102,11 @@
done
set -x
-$POLDEK -s $T/PLD/RPMS --mkidxz --mt=pdir
+if [ $POLDEK_OLD = yes ]; then
+ $POLDEK -s $T/PLD/RPMS --mkidxz
+else
+ $POLDEK -s $T/PLD/RPMS --mkidxz --mt=pdir
+fi
# please don't change it. installer relayes on presence of this
# file in cd image root
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20.2.2r2=1.20.2.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - disable verbose poldek outp...
Author: hawk Date: Sun Mar 12 21:55:27 2006 GMT
Module: admin Tag: AC-branch
Log message:
- disable verbose poldek output, it was used only for debugging
- cosmetics
Files affected:
admin/ftp:
geniso-poldek (1.15.2.13 - 1.15.2.14)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.13 admin/ftp/geniso-poldek:1.15.2.14
--- admin/ftp/geniso-poldek:1.15.2.13 Mon Oct 3 22:13:26 2005
+++ admin/ftp/geniso-poldek Sun Mar 12 22:55:22 2006
@@ -8,22 +8,19 @@
ROOT=/mnt/ftpcz
PATH=$ROOT/.stat/bin:$PATH; export PATH
-#MKISOFSOPT=-print-size
#MKISOFSOPT=-quiet
#BOOTDISK=PLD/images/bootdisk.img
BOOTDISK=PLD/images/bootdisk_iso.img
-# $POLDEK
#POLDEK=$ROOT/.stat/bin/poldek-ra
-POLDEK=/usr/bin/poldek
-POLDEK=$HOME/bin/poldek
+POLDEK=/usr/bin/poldek
#MKISOFS=$ROOT/.stat/bin/mkisofs
-MKISOFS=/usr/bin/mkisofs
+MKISOFS=/usr/bin/mkisofs
#ISOTMPDIR=
-ISOTMPDIR=~/tmp
+ISOTMPDIR=~/tmp
#ISOTARGET=/iso
ISOTARGET=/home/users/pldftpac/isos
@@ -33,19 +30,19 @@
ISOCD=/home/users/pldftpac/isocd/
#DIST=ra
-DIST=2.0
+DIST=2.0
#NAME=Ac
NAME=Ac
#TODAYS DATE
-DATA=20051001
+DATA=20060312
#VERSION=2.0
VERSION=2.0
#SUBVER=alpha-1
-SUBVER=RC1.1
+SUBVER=RC1
if [ $1 = dvd ]; then
@@ -136,7 +133,7 @@
# $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pdir
#fi
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
-$POLDEK -vv -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
+$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
--split-conf=/home/users/pldftpac/admin/ftp/poldek-iso.priority \
--split-out=${ISOTMPDIR}/pld-${ARCH}.iso.list || exit 1
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.13r2=1.15.2.14f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - don't use path for iso-prio...
Author: hawk Date: Sun Mar 12 21:57:34 2006 GMT
Module: admin Tag: AC-branch
Log message:
- don't use path for iso-priority, search in current dir instead
Files affected:
admin/ftp:
geniso-poldek (1.15.2.14 - 1.15.2.15)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.14 admin/ftp/geniso-poldek:1.15.2.15
--- admin/ftp/geniso-poldek:1.15.2.14 Sun Mar 12 22:55:22 2006
+++ admin/ftp/geniso-poldek Sun Mar 12 22:57:29 2006
@@ -135,7 +135,7 @@
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
- --split-conf=/home/users/pldftpac/admin/ftp/poldek-iso.priority \
+ --split-conf=./poldek-iso.priority \
--split-out=${ISOTMPDIR}/pld-${ARCH}.iso.list || exit 1
COUNT=$(ls -1 ${ISOTMPDIR}/pld-${ARCH}.iso.list* | wc -l)
@@ -167,7 +167,7 @@
echo cdrom_get = \/usr/bin/vfjuggle %d %Pn\
${ISODIR0}/.poldekrc
echo # priorites of packages used during generation of cd images
${ISODIR0}/.pkgsplit.conf
- cat /home/users/pldftpac/admin/ftp/poldek-iso.priority
${ISODIR0}/.pkgsplit.conf
+ cat ./poldek-iso.priority ${ISODIR0}/.pkgsplit.conf
# elif [ ${NR} = $COUNT ]; then
# mkdir -p ${ISODIR}/test/
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.14r2=1.15.2.15f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - fix tmp dir path
Author: hawk Date: Sun Mar 12 22:14:58 2006 GMT Module: admin Tag: AC-branch Log message: - fix tmp dir path Files affected: admin/ftp: geniso-poldek (1.15.2.15 - 1.15.2.16) Diffs: Index: admin/ftp/geniso-poldek diff -u admin/ftp/geniso-poldek:1.15.2.15 admin/ftp/geniso-poldek:1.15.2.16 --- admin/ftp/geniso-poldek:1.15.2.15 Sun Mar 12 22:57:29 2006 +++ admin/ftp/geniso-poldek Sun Mar 12 23:14:53 2006 @@ -20,7 +20,7 @@ MKISOFS=/usr/bin/mkisofs #ISOTMPDIR= -ISOTMPDIR=~/tmp +ISOTMPDIR=$HOME/tmp #ISOTARGET=/iso ISOTARGET=/home/users/pldftpac/isos CVS-web: http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.15r2=1.15.2.16f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - i386 .iso is bootable
Author: hawk Date: Sun Mar 12 22:18:50 2006 GMT
Module: admin Tag: AC-branch
Log message:
- i386 .iso is bootable
Files affected:
admin/ftp:
geniso-poldek (1.15.2.16 - 1.15.2.17)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.16 admin/ftp/geniso-poldek:1.15.2.17
--- admin/ftp/geniso-poldek:1.15.2.16 Sun Mar 12 23:14:53 2006
+++ admin/ftp/geniso-poldek Sun Mar 12 23:18:45 2006
@@ -219,9 +219,6 @@
if [ ${NR} = 1 ]; then
BOOTOPT=
case $ARCH in
- i386)
- BOOTOPT=
- ;;
i?86|athlon|amd64|x86_64)
BOOTOPT=-no-emul-boot -boot-info-table -boot-load-size 4
-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.catalog
;;
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.16r2=1.15.2.17f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - use PLD bootdisks for booti...
Author: hawk Date: Sun Mar 12 22:50:14 2006 GMT
Module: admin Tag: AC-branch
Log message:
- use PLD bootdisks for booting x86 ISOs
Files affected:
admin/ftp:
geniso-poldek (1.15.2.17 - 1.15.2.18)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.17 admin/ftp/geniso-poldek:1.15.2.18
--- admin/ftp/geniso-poldek:1.15.2.17 Sun Mar 12 23:18:45 2006
+++ admin/ftp/geniso-poldek Sun Mar 12 23:50:09 2006
@@ -219,7 +219,10 @@
if [ ${NR} = 1 ]; then
BOOTOPT=
case $ARCH in
- i?86|athlon|amd64|x86_64)
+ i?86|athlon)
+ BOOTOPT=-b ${BOOTDISK} -c PLD/images/boot.cat
+ ;;
+ amd64|x86_64)
BOOTOPT=-no-emul-boot -boot-info-table -boot-load-size 4
-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.catalog
;;
ppc)
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.17r2=1.15.2.18f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/poldek-iso.priority - fixed entry for pam p...
Author: hawk Date: Sun Mar 12 22:54:25 2006 GMT Module: admin Tag: AC-branch Log message: - fixed entry for pam packages Files affected: admin/ftp: poldek-iso.priority (1.8.2.5 - 1.8.2.6) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.5 admin/ftp/poldek-iso.priority:1.8.2.6 --- admin/ftp/poldek-iso.priority:1.8.2.5 Sun Mar 12 22:42:58 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 12 23:54:20 2006 @@ -92,7 +92,7 @@ openssh-clients-5 openssh-server -5 pam-5 -pam_pam* -5 +pam-pam_* -5 pciutils -5 pcmcia-cs -5 pcregrep -5 CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.5r2=1.8.2.6f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - what a mess... backported s...
Author: hawk Date: Sun Mar 12 23:19:26 2006 GMT
Module: admin Tag: AC-branch
Log message:
- what a mess... backported support for PLD bootdisks
Files affected:
admin/ftp:
geniso-poldek (1.15.2.18 - 1.15.2.19)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.18 admin/ftp/geniso-poldek:1.15.2.19
--- admin/ftp/geniso-poldek:1.15.2.18 Sun Mar 12 23:50:09 2006
+++ admin/ftp/geniso-poldek Mon Mar 13 00:19:20 2006
@@ -105,9 +105,8 @@
UTILS_SIZE=0
case ${ARCH} in
i?86)
- UTILS_SIZE_1=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/dosutils | grep total | xargs | cut -d -f1)
- UTILS_SIZE_2=$(du -scmD ${ISOCD}/i486 | grep total | xargs |
cut -d -f1)
- UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 10))
+ UTILS_SIZE=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,coinst,inst,images} | grep total |
xargs | cut -d -f1)
+ UTILS_SIZE=$(($UTILS_SIZE + 10))
;;
amd64|x86_64)
UTILS_SIZE_1=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/dosutils | grep total | xargs | cut -d -f1)
@@ -148,12 +147,11 @@
mkdir -p ${ISODIR}/PLD || exit 1
if [ ${NR} = 1 ]; then
case ${ARCH} in
- i386)
- ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
- ;;
- i586|i686|athlon)
+ i?86|athlon)
+ ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst${ISODIR}/PLD/coinst
+ ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images${ISODIR}/PLD/images
+ ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst${ISODIR}/PLD/inst
ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
- do_symlink ${ISOCD}/i486 ${ISODIR}/
;;
amd64|x86_64)
ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.18r2=1.15.2.19f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - fixed copy/paste errors
Author: hawk Date: Sun Mar 12 23:38:38 2006 GMT
Module: admin Tag: AC-branch
Log message:
- fixed copy/paste errors
Files affected:
admin/ftp:
geniso-poldek (1.15.2.19 - 1.15.2.20)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.19 admin/ftp/geniso-poldek:1.15.2.20
--- admin/ftp/geniso-poldek:1.15.2.19 Mon Mar 13 00:19:20 2006
+++ admin/ftp/geniso-poldek Mon Mar 13 00:38:33 2006
@@ -148,9 +148,9 @@
if [ ${NR} = 1 ]; then
case ${ARCH} in
i?86|athlon)
- ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst${ISODIR}/PLD/coinst
- ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images${ISODIR}/PLD/images
- ln -s
${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst${ISODIR}/PLD/inst
+ ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst
${ISODIR}/PLD/coinst
+ ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images
${ISODIR}/PLD/images
+ ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst
${ISODIR}/PLD/inst
ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
;;
amd64|x86_64)
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.19r2=1.15.2.20f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/geniso-poldek - coinst dir is obsolete
Author: hawk Date: Mon Mar 13 00:08:09 2006 GMT
Module: admin Tag: AC-branch
Log message:
- coinst dir is obsolete
Files affected:
admin/ftp:
geniso-poldek (1.15.2.20 - 1.15.2.21)
Diffs:
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.20 admin/ftp/geniso-poldek:1.15.2.21
--- admin/ftp/geniso-poldek:1.15.2.20 Mon Mar 13 00:38:33 2006
+++ admin/ftp/geniso-poldek Mon Mar 13 01:08:04 2006
@@ -105,7 +105,7 @@
UTILS_SIZE=0
case ${ARCH} in
i?86)
- UTILS_SIZE=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,coinst,inst,images} | grep total |
xargs | cut -d -f1)
+ UTILS_SIZE=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,inst,images} | grep total | xargs |
cut -d -f1)
UTILS_SIZE=$(($UTILS_SIZE + 10))
;;
amd64|x86_64)
@@ -148,7 +148,6 @@
if [ ${NR} = 1 ]; then
case ${ARCH} in
i?86|athlon)
- ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst
${ISODIR}/PLD/coinst
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images
${ISODIR}/PLD/images
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst
${ISODIR}/PLD/inst
ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.20r2=1.15.2.21f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: perl-DBD-Sybase.spec - updated to 1.07
Author: hawk Date: Mon Mar 13 12:39:18 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 1.07
Files affected:
SPECS:
perl-DBD-Sybase.spec (1.23 - 1.24)
Diffs:
Index: SPECS/perl-DBD-Sybase.spec
diff -u SPECS/perl-DBD-Sybase.spec:1.23 SPECS/perl-DBD-Sybase.spec:1.24
--- SPECS/perl-DBD-Sybase.spec:1.23 Wed Apr 27 16:45:54 2005
+++ SPECS/perl-DBD-Sybase.spec Mon Mar 13 13:39:12 2006
@@ -5,13 +5,13 @@
Summary: DBD::Sybase - Sybase database driver for the DBI module
Summary(pl): DBD::Sybase - sterownik DBI do bazy danych Sybase
Name: perl-DBD-Sybase
-Version: 1.05
-Release: 3
+Version: 1.07
+Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0:
http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5: 7d7b22eb7d1ea2e99d6087b241248ecc
+# Source0-md5: 65775337fd16f85c94aed51a7491d024
BuildRequires: freetds-devel
BuildRequires: perl-DBI = 1.00
BuildRequires: rpm-perlprov = 4.1-13
@@ -70,6 +70,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.24 2006/03/13 12:39:12 hawk
+- updated to 1.07
+
Revision 1.23 2005/04/27 14:45:54 hawk
- release 3
CVS-web:
http://cvs.pld-linux.org/SPECS/perl-DBD-Sybase.spec?r1=1.23r2=1.24f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: DBD-Sybase-1.07.tar.gz
Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/DBD/DBD-Sybase-1.07.tar.gz 65775337fd16f85c94aed51a7491d024 DBD-Sybase-1.07.tar.gz Size: 189553 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
admin (AC-branch): ftp/poldek-iso.priority - rc-boot and some pack...
Author: hawk Date: Mon Mar 13 18:14:18 2006 GMT Module: admin Tag: AC-branch Log message: - rc-boot and some packages needed by type server must be on first CD Files affected: admin/ftp: poldek-iso.priority (1.8.2.6 - 1.8.2.7) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.6 admin/ftp/poldek-iso.priority:1.8.2.7 --- admin/ftp/poldek-iso.priority:1.8.2.6 Sun Mar 12 23:54:20 2006 +++ admin/ftp/poldek-iso.priority Mon Mar 13 19:14:13 2006 @@ -110,6 +110,7 @@ procps -5 psmisc -5 quota -5 +rc-boot-5 rc-scripts -5 reiserfsprogs -5 rpm-5 @@ -219,6 +220,9 @@ # packages needed by server installation type should be on first CD +afio -4 +amanda-client -4 +amanda-server -4 apache -4 apache1-4 apache1-apxs -4 @@ -351,6 +355,7 @@ cvs-pserver-4 cyrus-imapd-4 dhcp -4 +dump -4 efingerd -4 exim -4 ffingerd -4 @@ -363,6 +368,7 @@ ircd-hybrid-4 ircd-ptlink-4 LPRng -4 +mt-st -4 mysql -4 mysql-bench-4 mysql-client -4 CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.6r2=1.8.2.7f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/poldek-iso.priority - fixed some X11 stuff
Author: hawk Date: Mon Mar 13 21:32:55 2006 GMT Module: admin Tag: AC-branch Log message: - fixed some X11 stuff Files affected: admin/ftp: poldek-iso.priority (1.8.2.7 - 1.8.2.8) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.7 admin/ftp/poldek-iso.priority:1.8.2.8 --- admin/ftp/poldek-iso.priority:1.8.2.7 Mon Mar 13 19:14:13 2006 +++ admin/ftp/poldek-iso.priority Mon Mar 13 22:32:50 2006 @@ -622,6 +622,8 @@ X11-driver-neomagic-3 X11-driver-nsc -3 X11-driver-nv -3 +X11-driver-nvidia -3 +X11-driver-nvidia-legacy -3 X11-driver-r128-3 X11-driver-radeon -3 X11-driver-rendition -3 @@ -672,7 +674,7 @@ X11-fonts-ISO8859-7-3 X11-fonts-ISO8859-8-3 X11-fonts-ISO8859-9-3 -X11-fonts-JISX0201.1976-3 +X11-fonts-JISX0201.1976-0 -3 X11-fonts-KOI8-R -3 X11-fonts-Syriac -3 X11-fonts-base -3 @@ -687,6 +689,7 @@ X11-tools -3 X11-twm-3 X11-xauth -3 +X11-xdm-3 X11-xfs-3 # WindowMaker on second CD CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.7r2=1.8.2.8f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: X11-driver-nvidia-legacy-build-fix.patch (NEW) - backport...
Author: hawk Date: Tue Mar 14 17:55:44 2006 GMT Module: SOURCES Tag: HEAD Log message: - backported compilation fix from driver version 8178 Files affected: SOURCES: X11-driver-nvidia-legacy-build-fix.patch (NONE - 1.1) (NEW) Diffs: Index: SOURCES/X11-driver-nvidia-legacy-build-fix.patch diff -u /dev/null SOURCES/X11-driver-nvidia-legacy-build-fix.patch:1.1 --- /dev/null Tue Mar 14 18:55:44 2006 +++ SOURCES/X11-driver-nvidia-legacy-build-fix.patchTue Mar 14 18:55:39 2006 @@ -0,0 +1,16 @@ +diff -ur nv.orig/usr/src/nv/conftest.sh nv/usr/src/nv/conftest.sh +--- nv.orig/usr/src/nv/conftest.sh 2006-03-14 18:48:33.0 +0100 nv/usr/src/nv/conftest.sh 2006-03-14 18:47:51.0 +0100 +@@ -15,9 +15,11 @@ + -nostdinc -isystem $ISYSTEM \ + -Werror-implicit-function-declaration + ++ + if [ $OUTPUT != $SOURCES ]; then ++ARCH=`uname -m | sed -e 's/i.86/i386/'` + CFLAGS=$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \ +--I$HEADERS -I$HEADERS/asm/mach-default ++-I$HEADERS -I$HEADERS/asm-$ARCH/mach-default + else + CFLAGS=$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default + fi ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: X11-driver-nvidia-legacy.spec - make it build
Author: hawk Date: Tue Mar 14 17:56:56 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- make it build
Files affected:
SPECS:
X11-driver-nvidia-legacy.spec (1.20 - 1.21)
Diffs:
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.20
SPECS/X11-driver-nvidia-legacy.spec:1.21
--- SPECS/X11-driver-nvidia-legacy.spec:1.20Fri Mar 3 23:13:30 2006
+++ SPECS/X11-driver-nvidia-legacy.spec Tue Mar 14 18:56:51 2006
@@ -10,7 +10,7 @@
%define_nv_ver 1.0
%define_nv_rel 7174
%define_min_x116.7.0
-%define_rel6.2
+%define_rel6.3
#
#
%defineoldname X11-driver-nvidia
@@ -36,6 +36,7 @@
Patch6:NVIDIA_kernel-1.0-7174-1321905.diff
Patch7:NVIDIA_kernel-1.0-7174-1361053.diff
Patch8:NVIDIA_kernel-1.0-7174-1386866.diff
+Patch9:%{name}-build-fix.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
BuildRequires: %{kgcc_package}
@@ -197,6 +198,7 @@
%patch6 -p0
%patch7 -p0
%patch8 -p0
+%patch9 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
@@ -365,6 +367,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.21 2006/03/14 17:56:51 hawk
+- make it build
+
Revision 1.20 2006/03/03 22:13:30 hawk
- fixed release numbering
CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.20r2=1.21f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: X11-driver-nvidia-legacy.spec - release 7
Author: hawk Date: Tue Mar 14 18:12:30 2006 GMT Module: SPECS Tag: HEAD Log message: - release 7 Files affected: SPECS: X11-driver-nvidia-legacy.spec (1.21 - 1.22) Diffs: Index: SPECS/X11-driver-nvidia-legacy.spec diff -u SPECS/X11-driver-nvidia-legacy.spec:1.21 SPECS/X11-driver-nvidia-legacy.spec:1.22 --- SPECS/X11-driver-nvidia-legacy.spec:1.21Tue Mar 14 18:56:51 2006 +++ SPECS/X11-driver-nvidia-legacy.spec Tue Mar 14 19:12:24 2006 @@ -10,7 +10,7 @@ %define_nv_ver 1.0 %define_nv_rel 7174 %define_min_x116.7.0 -%define_rel6.3 +%define_rel7 # # %defineoldname X11-driver-nvidia @@ -367,6 +367,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.22 2006/03/14 18:12:24 hawk +- release 7 + Revision 1.21 2006/03/14 17:56:51 hawk - make it build CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.21r2=1.22f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer: installer.conf ui/ui-functions
Author: hawk Date: Tue Mar 14 23:03:53 2006 New Revision: 7161 Modified: bootdisk/trunk/batch-installer/installer.conf bootdisk/trunk/batch-installer/ui/ui-functions Log: - small cleanup Modified: bootdisk/trunk/batch-installer/installer.conf == --- bootdisk/trunk/batch-installer/installer.conf (original) +++ bootdisk/trunk/batch-installer/installer.conf Tue Mar 14 23:03:53 2006 @@ -58,7 +58,6 @@ # dest_devices: space delimited list of target devices # (like '/dev/hda /dev/sdb') -# dest_types: space delimited list of destination device types # dest_devices_actions: space delimited list, one of items below per device: # - make_new # - use_existing @@ -77,7 +76,6 @@ # set (while no dest_part3_device). # Numeration starts at 1. dest_devices=/dev/hda -dest_types=ide dest_devices_actions=make_new # Modified: bootdisk/trunk/batch-installer/ui/ui-functions == --- bootdisk/trunk/batch-installer/ui/ui-functions (original) +++ bootdisk/trunk/batch-installer/ui/ui-functions Tue Mar 14 23:03:53 2006 @@ -187,7 +187,6 @@ # dest_devices: space delimited list of target devices # (like '/dev/hda /dev/sdb') -# dest_devices_types: space delimited list of destination devices types # dest_devices_actions: space delimited list, one of items below per device: # - make_new # - use_existing ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-validate
Author: hawk Date: Tue Mar 14 23:14:08 2006 New Revision: 7162 Modified: bootdisk/trunk/batch-installer/installer-validate Log: - don't allow hostadapters_modules to be empty when source = disk Modified: bootdisk/trunk/batch-installer/installer-validate == --- bootdisk/trunk/batch-installer/installer-validate (original) +++ bootdisk/trunk/batch-installer/installer-validate Tue Mar 14 23:14:08 2006 @@ -363,6 +363,7 @@ ;; disk) + is_not_empty hostadapters_modules case $source_device in /dev/[hs]d[a-h][0-9] | /dev/[hs]d[a-h][0-9][0-9] ) : ;; ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer.conf
Author: hawk Date: Wed Mar 15 11:06:12 2006 New Revision: 7164 Modified: bootdisk/trunk/batch-installer/installer.conf Log: - empty source and destination devices by default - default /boot size increased to 30 MBs - root partition on ext2 by default Modified: bootdisk/trunk/batch-installer/installer.conf == --- bootdisk/trunk/batch-installer/installer.conf (original) +++ bootdisk/trunk/batch-installer/installer.conf Wed Mar 15 11:06:12 2006 @@ -21,7 +21,7 @@ # source_additional: space separated, additional sources for package # installation. You need to specify http://, ftp:// or file://. source=cdrom -source_device=auto +source_device= source_filesystem=iso9660 source_dir=/ source_additional= @@ -75,14 +75,14 @@ # to have dest_part1_device, dest_part2_device and dest_part4_device # set (while no dest_part3_device). # Numeration starts at 1. -dest_devices=/dev/hda +dest_devices= dest_devices_actions=make_new # # partition 1 # -dest_part1_device=/dev/hda -dest_part1_size=20 +dest_part1_device= +dest_part1_size=30 dest_part1_filesystem=ext2 dest_part1_format_partition=yes dest_part1_mnt_point=/boot @@ -93,7 +93,7 @@ # # partition 2 # -dest_part2_device=/dev/hda +dest_part2_device= dest_part2_size=256 dest_part2_filesystem=swap dest_part2_format_partition=yes @@ -105,9 +105,9 @@ # # partition 3 # -dest_part3_device=/dev/hda +dest_part3_device= dest_part3_size=100% of free -dest_part3_filesystem=xfs +dest_part3_filesystem=ext2 dest_part3_format_partition=yes dest_part3_mnt_point=/ dest_part3_options=defaults ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui/ui-main
Author: hawk
Date: Wed Mar 15 11:16:41 2006
New Revision: 7166
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
Log:
- make sure that hostadapters_modules are set and loaded before
selecting source devices (only for source type cdrom and disk)
- show more detailed list of CD-ROMs, mark detected ones
- with source type disk show only detected patitions in source
partition selection dialog
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Wed Mar 15 11:16:41 2006
@@ -81,79 +81,138 @@
EOF
}
+cd_det () {
+ if echo $autocdrom | grep -q $1 ; then
+nls (detected)
+ fi
+}
+
ui-source_device () {
-case $source in
-cdrom)
- item1=/dev/hda
- item2=/dev/hdb
- item3=/dev/hdc
- item4=/dev/hdd
- item5=/dev/scd0
- item6=/dev/scd1
- item7=/dev/scd2
- item8=/dev/scd3
- item9=/dev/scd4
- dml EOF
- br`nls If you have single IDE cdrom, choose auto`
- br
- meta title=CDROM
- menu id=res_menu res=1
- item id=ui_custom${custom_text}
- item id=auto${auto_text}
- item id=$item1$item1
- item id=$item2$item2
- item id=$item3$item3
- item id=$item4$item4
- item id=$item5$item5
- item id=$item6$item6
- item id=$item7$item7
- item id=$item8$item8
- item id=$item9$item9
- /menu
- $@
-EOF
- ;;
-nfs)
- item1=192.168.0.1:/home/users/klakier/rpm
- item2=heaven.net:/pub/all/saints
+local bailout scds cscd
+bailout=
+autocdrom=
+
+case $source in
+cdrom|disk)
+if test -z $hostadapters_modules; then
dml EOF
- br`nls NFS device should be given in form machine:/directory.`
+ meta title=$(nls Information)
+ meta active=$act
br
- meta title=$(nls NFS server)
- menu id=res_menu res=1
- item id=ui_custom${custom_text}
- item id=$item1$item1
- item id=$item2$item2
- /menu
- $@
+ br`nls hostadapters_modules must be set before selecting source
devices.`
+ brbr
+ button res=1
EOF
- ;;
-net)
- dml EOF
- br`nls Choose server or enter custom one`
- br
- meta title=$(nls Remote server)
- menu id=res_menu res=1
- item id=ui_custom${custom_text}
-$(ui-mirror just-dump)
- /menu
- $@
+ bailout=true
+else
+ # execute load_device_modules with output redirected to current console
+ load_device_modules $hostadapters_modules 1/dev/tty 2/dev/tty
+ if [ -d /proc/ide ] ; then
+ for f in /proc/ide/hd* ; do
+ if [ -f $f/media ] [ $(cat $f/media) = cdrom ] ; then
+ autocdrom=$autocdrom /dev/`basename $f`
+ fi
+ done
+ fi
+ if [ -f /proc/scsi/scsi ] ; then
+ scds=`cat /proc/scsi/scsi | grep Type:.*CD-ROM | wc -l`
+ cscd=0
+ while [ $cscd -lt $scds ]; do
+ autocdrom=$autocdrom /dev/scd$cscd
+ cscd=$(($cscd+1))
+ done
+ fi
+ autocdrom=$(echo $autocdrom | sed -e 's/^ //')
+;;
+esac
+
+if test -z $bailout; then
+case $source in
+cdrom)
+ dml EOF
+ br`nls Choose your CD-ROM device. If you have single CD
drive, choose auto.`
+ br
+ meta title='$(nls CD-ROM device)'
+ menu id=res_menu res=1
+ item id=ui_custom${custom_text}
+ item id=auto${auto_text}
+ item id=/dev/hda/dev/hda $(nls (Primary Master)) $(cd_det
/dev/hda)
+ item id=/dev/hdb/dev/hdb $(nls (Primary Slave)) $(cd_det
/dev/hdb)
+ item id=/dev/hdc/dev/hdc $(nls (Secondary Master)) $(cd_det
/dev/hdc)
+ item id=/dev/hdd/dev/hdd $(nls (Secondary Slave)) $(cd_det
/dev/hdd)
+ item id=/dev/scd0/dev/scd0 $(nls (SCSI CD-ROM #0)) $(cd_det
/dev/scd0)
+ item id=/dev/scd1/dev/scd1 $(nls (SCSI CD-ROM #1)) $(cd_det
/dev/scd1)
+ item id=/dev/scd2/dev/scd2 $(nls (SCSI CD-ROM #2)) $(cd_det
/dev/scd2)
+ item id=/dev/scd3/dev/scd3 $(nls (SCSI CD-ROM #3)) $(cd_det
/dev/scd3)
+ /menu
+ $@
EOF
;;
-disk)
- dml EOF
- br`nls Choose partition or enter custom one`
+ disk)
+ dml EOF
+ br`nls Choose partition or enter custom one.`
br
meta title=$(nls Disk partition with source)
menu id=res_menu res=1
item id=ui_custom${custom_text}
- item id=/dev/hda1/dev/hda1
- item id=/dev/hda2/dev/hda2
SPECS: squid.spec - updated to 2.5.STABLE13 - release 2 (1 will be...
Author: hawk Date: Thu Mar 16 21:50:15 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 2.5.STABLE13
- release 2 (1 will be for Ra)
Files affected:
SPECS:
squid.spec (1.243 - 1.244)
Diffs:
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.243 SPECS/squid.spec:1.244
--- SPECS/squid.spec:1.243 Mon Mar 13 23:31:49 2006
+++ SPECS/squid.specThu Mar 16 22:50:10 2006
@@ -11,13 +11,13 @@
Summary(uk): Squid - ËĹŰ ĎÂ'¤ËÔŚ× Internet
Summary(zh_CN):SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
Name: squid
-Version: 2.5.STABLE12
-Release: 9
+Version: 2.5.STABLE13
+Release: 2
Epoch: 7
License: GPL v2
Group: Networking/Daemons
Source0:
http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 7354255015b3772a1e024dfac173e48c
+# Source0-md5: 3e64468e123be1246d17486dab6bee87
# http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
Source1: %{name}-FAQ.tar.gz
# Source1-md5: cb9a955f8cda9cc166e086fccd412a43
@@ -30,11 +30,6 @@
Source6: %{name}.logrotate
Source7: %{name}.pamd
# Bug fixes from Squid home page, please include URL
-Patch0:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
-Patch1:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-SMB_BadFetch.patch
-Patch2:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-wbinfo_group.patch
-Patch3:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-asyncio_counters.patch
-Patch4:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-prctl_args.patch
# Other patches:
Patch100: http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
Patch101: %{name}-fhs.patch
@@ -443,11 +438,6 @@
%prep
%setup -q -a1 -a4
# Bug fixes from Squid home page:
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# Other patches:
%patch100 -p1
%patch101 -p1
@@ -765,6 +755,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.244 2006/03/16 21:50:10 hawk
+- updated to 2.5.STABLE13
+- release 2 (1 will be for Ra)
+
Revision 1.243 2006/03/13 22:31:49 glen
- cosmetics
CVS-web:
http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.243r2=1.244f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: squid-2.5.STABLE13.tar.bz2 squid-FAQ.tar.gz squid-book-full-html.zip
Files fetched: 1 STORED: http://www.squid-cache.org/Versions/v2/2.5/squid-2.5.STABLE13.tar.bz2 3e64468e123be1246d17486dab6bee87 squid-2.5.STABLE13.tar.bz2 Size: 1074112 bytes ALREADY GOT: no-url://squid-FAQ.tar.gz cb9a955f8cda9cc166e086fccd412a43 squid-FAQ.tar.gz ALREADY GOT: no-url://squid-book-full-html.zip 4f3b6dab1de9cbb847df89d8b417378a squid-book-full-html.zip -- 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: squid-2.5.STABLE12-SMB_BadFetch.patch (REMOVED), squid-2....
Author: hawk Date: Thu Mar 16 21:54:33 2006 GMT Module: SOURCES Tag: HEAD Log message: - obsolete Files affected: SOURCES: squid-2.5.STABLE12-SMB_BadFetch.patch (1.1 - NONE) (REMOVED), squid-2.5.STABLE12-asyncio_counters.patch (1.1 - NONE) (REMOVED), squid-2.5.STABLE12-prctl_args.patch (1.1 - NONE) (REMOVED), squid-2.5.STABLE12-setenv.patch (1.1 - NONE) (REMOVED), squid-2.5.STABLE12-wbinfo_group.patch (1.1 - NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (RA-branch): squid.spec - updated to 2.5.STABLE13
Author: hawk Date: Thu Mar 16 22:02:31 2006 GMT
Module: SPECS Tag: RA-branch
Log message:
- updated to 2.5.STABLE13
Files affected:
SPECS:
squid.spec (1.135.2.37 - 1.135.2.38)
Diffs:
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.135.2.37 SPECS/squid.spec:1.135.2.38
--- SPECS/squid.spec:1.135.2.37 Tue Jan 17 15:54:29 2006
+++ SPECS/squid.specThu Mar 16 23:02:25 2006
@@ -11,13 +11,13 @@
Summary(uk): Squid - ËĹŰ ĎÂ'¤ËÔŚ× Internet
Summary(zh_CN):SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
Name: squid
-Version: 2.5.STABLE12
-Release: 1.1
+Version: 2.5.STABLE13
+Release: 1
Epoch: 7
License: GPL v2
Group: Networking/Daemons
Source0:
http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2
-# Source0-md5: 7354255015b3772a1e024dfac173e48c
+# Source0-md5: 3e64468e123be1246d17486dab6bee87
# http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
Source1: %{name}-FAQ.tar.gz
# Source1-md5: cb9a955f8cda9cc166e086fccd412a43
@@ -30,11 +30,6 @@
Source6: %{name}.logrotate
Source7: %{name}.pamd
# Bug fixes from Squid home page, please include URL
-Patch0:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
-Patch1:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-SMB_BadFetch.patch
-Patch2:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-wbinfo_group.patch
-Patch3:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-asyncio_counters.patch
-Patch4:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-prctl_args.patch
# Other patches:
Patch100: http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
Patch101: %{name}-fhs.patch
@@ -420,11 +415,6 @@
%prep
%setup -q -a1 -a4
# Bug fixes from Squid home page:
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# Other patches:
%patch100 -p1
%patch101 -p1
@@ -733,6 +723,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.135.2.38 2006/03/16 22:02:25 hawk
+- updated to 2.5.STABLE13
+
Revision 1.135.2.37 2006/01/17 14:54:29 hawk
- more patches from squids site, apply libnsl_fixes patch, merged nolibs
and align patches from HEAD, renumbered patches
CVS-web:
http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.135.2.37r2=1.135.2.38f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (RA-branch): zoo-CAN-2005-2349.patch - updated for gcc 2.95
Author: hawk Date: Thu Mar 16 22:19:41 2006 GMT
Module: SOURCES Tag: RA-branch
Log message:
- updated for gcc 2.95
Files affected:
SOURCES:
zoo-CAN-2005-2349.patch (1.1 - 1.1.2.1)
Diffs:
Index: SOURCES/zoo-CAN-2005-2349.patch
diff -u SOURCES/zoo-CAN-2005-2349.patch:1.1
SOURCES/zoo-CAN-2005-2349.patch:1.1.2.1
--- SOURCES/zoo-CAN-2005-2349.patch:1.1 Thu Mar 16 20:47:16 2006
+++ SOURCES/zoo-CAN-2005-2349.patch Thu Mar 16 23:19:36 2006
@@ -2,11 +2,18 @@
--- portable.c
+++ portable.c
-@@ -364,6 +364,31 @@
+@@ -344,6 +344,7 @@
+ ZOOFILE zoo_file;
+ {
+int status;
++ char *p;
+BYTE bytes[MAXDIRSIZE];/* big enough to hold variable part too */
+
+/* To simplify things, we read the maximum possible size of the
+@@ -364,6 +365,30 @@
show_dir(direntry);
}
#endif
-+ char *p;
+ /* take off '../' */
+ while ((p = strstr( direntry-dirname, ../ )) != NULL) {
+ while (*(p+3) != '\0') {
CVS-web:
http://cvs.pld-linux.org/SOURCES/zoo-CAN-2005-2349.patch?r1=1.1r2=1.1.2.1f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (RA-branch): zoo.spec - merged changes from HEAD - release 6...
Author: hawk Date: Thu Mar 16 22:21:11 2006 GMT
Module: SPECS Tag: RA-branch
Log message:
- merged changes from HEAD
- release 6.1 for Ra security
Files affected:
SPECS:
zoo.spec (1.8.2.2 - 1.8.2.3)
Diffs:
Index: SPECS/zoo.spec
diff -u SPECS/zoo.spec:1.8.2.2 SPECS/zoo.spec:1.8.2.3
--- SPECS/zoo.spec:1.8.2.2 Fri Mar 19 20:54:43 2004
+++ SPECS/zoo.spec Thu Mar 16 23:21:05 2006
@@ -5,14 +5,21 @@
Summary(uk): őÔÉĚŚÔÁ ÁŇČÉ×ÁĂŚ§ ÔÁ ËĎÍĐŇĹÓŚ§ ÄĚŃ ÁŇČŚ×Ś× ĆĎŇÍÁÔŐ ZOO
Name: zoo
Version: 2.10
-Release: 6
+Release: 6.1
License: Copyrighted, freely distributable if unmodified
Group: Applications/Archiving
-#Source0:
ftp://sunsite.unc.edu:/pub/Linux/utils/compress/%{name}-%{PACKAGE_VERSION}.tar.gz
+# ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}-%{version}-3.src.rpm
Source0:
ftp://ftp.slackware.org/pub/slackware/source/a/bin/%{name}-%{version}.tar.gz
# Source0-md5: f5d3ffdd65cc8a511c83e3c3f108c27e
+# I hope these patches don't violete license...
+# (source tarball is still unmodified, patches only make thing build,
+# without any changes in behaviour of produced binary)
Patch0:
ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}-2.10.linux.diff.gz
-Buildroot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Patch1:%{name}-morelinux.patch
+Patch2:%{name}-CAN-2005-2349.patch
+Patch3:%{name}-febz-183426.patch
+Patch4:%{name}-security_pathsize.patch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
zoo is a file archiving utility for maintaining collections of files.
@@ -37,10 +44,16 @@
%prep
%setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p0
%build
-%{__make} CC=%{__cc} OPTIM=%{rpmcflags} linux
+%{__make} linux \
+ CC=%{__cc} \
+ OPTIM=%{rpmcflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -64,6 +77,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.8.2.3 2006/03/16 22:21:05 hawk
+- merged changes from HEAD
+- release 6.1 for Ra security
+
Revision 1.8.2.2 2004/03/19 19:54:43 twittner
- md5
CVS-web:
http://cvs.pld-linux.org/SPECS/zoo.spec?r1=1.8.2.2r2=1.8.2.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/poldek-iso.priority
Author: hawk Date: Sun Mar 19 17:39:59 2006 New Revision: 7223 Removed: bootdisk/trunk/batch-installer/poldek-iso.priority Log: - not needed ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui/ui-main
Author: hawk Date: Sun Mar 19 19:59:03 2006 New Revision: 7224 Modified: bootdisk/trunk/batch-installer/ui/ui-main Log: - allow more filesystems with source=disk - added missing fi - cosmetics Modified: bootdisk/trunk/batch-installer/ui/ui-main == --- bootdisk/trunk/batch-installer/ui/ui-main (original) +++ bootdisk/trunk/batch-installer/ui/ui-main Sun Mar 19 19:59:03 2006 @@ -72,7 +72,7 @@ br meta title=$(nls Type of installation) menu id=res_menu res=1 -item id=cdrom_cdrom +item id=cdrom_cdrom: `nls CD-ROM device` item id=net_net: `nls network server (ftp, http)` item id=nfs_nfs: `nls NFS server` item id=disk_disk: `nls Hard disk partition` @@ -123,6 +123,7 @@ done fi autocdrom=$(echo $autocdrom | sed -e 's/^ //') +fi ;; esac @@ -224,9 +225,12 @@ br meta title=$(nls Source filesystem) menu id=res_menu res=1 - item id=ext2`nls Linux ext2 filesystem` - item id=reiserfs`nls Reiser FS filesystem` - item id=vfat`nls FAT or FAT32 filesystem (eg. Windows partition)` + item id=ext2ext2: `nls Linux ext2 filesystem` + item id=reiserfsreiserfs: `nls Reiser FS filesystem` + item id=jfsjfs: `nls IBM Journaling Filesystem` + item id=ext3ext3: `nls Journaling version of ext2` + item id=xfsxfs: `nls SGI Journaling Filesystem` + item id=vfatvfat: `nls FAT or FAT32 filesystem` /menu $@ EOF ;; ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk
Date: Sun Mar 19 20:00:50 2006
New Revision: 7225
Modified:
bootdisk/trunk/batch-installer/installer-prep
Log:
- load required filesystem module before mounting disk source
Modified: bootdisk/trunk/batch-installer/installer-prep
==
--- bootdisk/trunk/batch-installer/installer-prep (original)
+++ bootdisk/trunk/batch-installer/installer-prep Sun Mar 19 20:00:50 2006
@@ -220,6 +220,26 @@
load_module isofs
}
+load_fs_modules () {
+case $source_filesystem in
+ext2)
+ load_module ext2
+ ;;
+reiserfs)
+ load_module reiserfs
+ ;;
+jfs)
+ load_module jfs
+ ;;
+ext3)
+ load_module ext3
+ ;;
+xfs)
+ load_module xfs
+ ;;
+esac
+}
+
load_nfs_modules () {
load_module nfs
}
@@ -564,6 +584,7 @@
load_module sd_mod
;;
esac
+ load_fs_modules
mount_source -o ro
find_source_dir
;;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-pkgs
Author: hawk Date: Sun Mar 19 20:02:57 2006 New Revision: 7226 Modified: bootdisk/trunk/batch-installer/installer-pkgs Log: - fixed source dir autodetection bug Modified: bootdisk/trunk/batch-installer/installer-pkgs == --- bootdisk/trunk/batch-installer/installer-pkgs (original) +++ bootdisk/trunk/batch-installer/installer-pkgs Sun Mar 19 20:02:57 2006 @@ -48,13 +48,13 @@ fi load_config -find_source_dir set -e #set -x rpms_dir=PLD/RPMS source_mountpoint=/src +find_source_dir is_dest_mounted ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/mini-iso
Author: hawk Date: Sun Mar 19 20:04:56 2006 New Revision: 7228 Modified: bootdisk/trunk/batch-installer/mini-iso Log: - removed xfsprogs, filesystem tools are added automagically Modified: bootdisk/trunk/batch-installer/mini-iso == --- bootdisk/trunk/batch-installer/mini-iso (original) +++ bootdisk/trunk/batch-installer/mini-iso Sun Mar 19 20:04:56 2006 @@ -70,5 +70,4 @@ vixie-cron wget which -xfsprogs zip ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/pkg/root.sh
Author: hawk Date: Sun Mar 19 20:08:16 2006 New Revision: 7229 Modified: bootdisk/trunk/pkg/root.sh Log: - use mini-iso as default pacakge set Modified: bootdisk/trunk/pkg/root.sh == --- bootdisk/trunk/pkg/root.sh (original) +++ bootdisk/trunk/pkg/root.sh Sun Mar 19 20:08:16 2006 @@ -103,4 +103,4 @@ ;; esac -install etc/installer.pkgsets/base etc/installer.pkgs +install ../../batch-installer/mini-iso etc/installer.pkgs ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer.pkgs
Author: hawk Date: Sun Mar 19 20:09:25 2006 New Revision: 7230 Modified: bootdisk/trunk/batch-installer/installer.pkgs Log: - this should be copy of mini-iso package set Modified: bootdisk/trunk/batch-installer/installer.pkgs == --- bootdisk/trunk/batch-installer/installer.pkgs (original) +++ bootdisk/trunk/batch-installer/installer.pkgs Sun Mar 19 20:09:25 2006 @@ -1,18 +1,15 @@ -FHS -MAKEDEV -SysVinit -apmd basesystem bash -bind-utils bzip2 chkconfig cpio cracklib cracklib-dicts +db dev dhcpcd -file +elinks +FHS findutils fix-info-dir ftp @@ -21,26 +18,19 @@ gettext glibc grep +groff gzip -hexedit -info iproute2 -iputils iputils-ping issue kbd -kernel -less +kernel-grsecurity lftp -libstdc++ -lilo +links login logrotate losetup -lsof -ltrace lynx -mailx man man-pages mawk @@ -49,59 +39,35 @@ mktemp modutils mount -mutt -nc ncftp -ncompress net-tools -nmap -openssh openssh-clients openssh-server pam pciutils -pcregrep pdksh -perl -pine -pinfo pldbug poldek -procmail +popt +ppp procps -psmisc -quota rc-scripts rpm -rpm-utils -rsync +rp-pppoe sed setserial setup shadow -shadow-extras -sharutils -slocate strace syslog-ng +SysVinit tar -tcp_wrappers -tcpdump telnet -terminfo -time -unace -unarj -unrar -unzip unzip utempter util-linux -vim -vim-rt vim-static vixie-cron wget which zip -zsh ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer.conf
Author: hawk Date: Sun Mar 19 20:12:14 2006 New Revision: 7231 Modified: bootdisk/trunk/batch-installer/installer.conf Log: - blah, empty dest_devices breaks too many things Modified: bootdisk/trunk/batch-installer/installer.conf == --- bootdisk/trunk/batch-installer/installer.conf (original) +++ bootdisk/trunk/batch-installer/installer.conf Sun Mar 19 20:12:14 2006 @@ -75,13 +75,13 @@ # to have dest_part1_device, dest_part2_device and dest_part4_device # set (while no dest_part3_device). # Numeration starts at 1. -dest_devices= +dest_devices=/dev/hda dest_devices_actions=make_new # # partition 1 # -dest_part1_device= +dest_part1_device=/dev/hda dest_part1_size=30 dest_part1_filesystem=ext2 dest_part1_format_partition=yes @@ -93,7 +93,7 @@ # # partition 2 # -dest_part2_device= +dest_part2_device=/dev/hda dest_part2_size=256 dest_part2_filesystem=swap dest_part2_format_partition=yes @@ -105,7 +105,7 @@ # # partition 3 # -dest_part3_device= +dest_part3_device=/dev/hda dest_part3_size=100% of free dest_part3_filesystem=ext2 dest_part3_format_partition=yes ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk
Date: Sun Mar 19 20:35:54 2006
New Revision: 7232
Modified:
bootdisk/trunk/batch-installer/installer-prep
Log:
- when source is already mounted, umount it (fixes mount errors while
doing installation after previously failed one)
Modified: bootdisk/trunk/batch-installer/installer-prep
==
--- bootdisk/trunk/batch-installer/installer-prep (original)
+++ bootdisk/trunk/batch-installer/installer-prep Sun Mar 19 20:35:54 2006
@@ -25,7 +25,7 @@
# mount wrapper
mount_source () {
test -d ${source_mountpoint} || mkdir ${source_mountpoint}
-if cat /proc/mounts | grep -q $source_mountpoint; then return; fi
+if cat /proc/mounts | grep -q $source_mountpoint; then umount
${source_mountpoint}; fi
log info `nls Mounting %s on %s type %s ${source_device}
${source_mountpoint} ${source_filesystem}`
log_wrap_verb mount -t ${source_filesystem} ${source_device}
${source_mountpoint} $@
}
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui: ui-main ui-parted2
Author: hawk
Date: Sun Mar 19 21:01:42 2006
New Revision: 7233
Modified:
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-parted2
Log:
- more mountpoints
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Sun Mar 19 21:01:42 2006
@@ -442,7 +442,7 @@
example_mnt_point_items () {
local desc id dir i
-for i in swap / /boot /home /home/users /usr /var /var/spool; do
+for i in swap / /boot /home /home/users /home/services /srv /usr /var /var/lib
/var/log /var/mail /var/spool; do
desc=
id=0
while : ; do
Modified: bootdisk/trunk/batch-installer/ui/ui-parted2
==
--- bootdisk/trunk/batch-installer/ui/ui-parted2(original)
+++ bootdisk/trunk/batch-installer/ui/ui-parted2Sun Mar 19 21:01:42 2006
@@ -640,12 +640,15 @@
item id=// ($(nls Root filesystem))
item id=/boot/boot
item id=/home/home
+item id=/home/users/home/users
+item id=/home/services/home/services
+item id=/srv/srv
item id=/usr/usr
item id=/var/var
-item id=/var/spool/var/spool
+item id=/var/lib/var/lib
+item id=/var/log/var/log
item id=/var/mail/var/mail
-item id=/var/cache/var/cache
-item id=/home/users/home/users
+item id=/var/spool/var/spool
item id=custom$(nls _C_u_s_t_o_m)
item id=skip$(nls Don't use for installation.)
/menu
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui/data/groups
Author: hawk Date: Sun Mar 19 21:07:51 2006 New Revision: 7234 Modified: bootdisk/trunk/batch-installer/ui/data/groups Log: - mod_deflate moved to 'base apache', mod_ssl moved to optional stuff Modified: bootdisk/trunk/batch-installer/ui/data/groups == --- bootdisk/trunk/batch-installer/ui/data/groups (original) +++ bootdisk/trunk/batch-installer/ui/data/groups Sun Mar 19 21:07:51 2006 @@ -208,6 +208,7 @@ apache-mod_autoindex apache-mod_cern_meta apache-mod_cgi +apache-mod_deflate apache-mod_dir apache-mod_env apache-mod_include @@ -218,7 +219,6 @@ apache-mod_rewrite apache-mod_setenvif apache-mod_speling -apache-mod_ssl apache-mod_userdir apache-mod_version apache-mod_vhost_alias @@ -245,7 +245,6 @@ !apache-mod_charset_lite !apache-mod_dav !apache-mod_dbd -!apache-mod_deflate !apache-mod_dumpio !apache-mod_echo !apache-mod_expires @@ -260,6 +259,7 @@ !apache-mod_log_forensic !apache-mod_logio !apache-mod_proxy +!apache-mod_ssl !apache-mod_status !apache-mod_unique_id !apache-mod_usertrack ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/mini-iso.lst - added tmpwatch
Author: hawk Date: Sun Mar 19 20:09:44 2006 GMT Module: admin Tag: AC-branch Log message: - added tmpwatch Files affected: admin/ftp: mini-iso.lst (1.17.2.3 - 1.17.2.4) Diffs: Index: admin/ftp/mini-iso.lst diff -u admin/ftp/mini-iso.lst:1.17.2.3 admin/ftp/mini-iso.lst:1.17.2.4 --- admin/ftp/mini-iso.lst:1.17.2.3 Sun Mar 12 20:24:56 2006 +++ admin/ftp/mini-iso.lst Sun Mar 19 21:09:39 2006 @@ -79,6 +79,7 @@ SysVinit tar telnet +tmpwatch unzip utempter util-linux CVS-web: http://cvs.pld-linux.org/admin/ftp/mini-iso.lst?r1=1.17.2.3r2=1.17.2.4f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/mini-iso.lst - added rdate, rdate-bsd, ntp-...
Author: hawk Date: Sun Mar 19 20:45:43 2006 GMT Module: admin Tag: AC-branch Log message: - added rdate, rdate-bsd, ntp-client Files affected: admin/ftp: mini-iso.lst (1.17.2.4 - 1.17.2.5) Diffs: Index: admin/ftp/mini-iso.lst diff -u admin/ftp/mini-iso.lst:1.17.2.4 admin/ftp/mini-iso.lst:1.17.2.5 --- admin/ftp/mini-iso.lst:1.17.2.4 Sun Mar 19 21:09:39 2006 +++ admin/ftp/mini-iso.lst Sun Mar 19 21:45:37 2006 @@ -51,6 +51,7 @@ mount ncftp net-tools +ntp-client openssh-clients openssh-server pam @@ -64,6 +65,8 @@ ppp procps rc-scripts +rdate +rdate-bsd reiserfsprogs rpm rp-pppoe CVS-web: http://cvs.pld-linux.org/admin/ftp/mini-iso.lst?r1=1.17.2.4r2=1.17.2.5f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin (AC-branch): ftp/poldek-iso.priority - rdate, rdate-bsd, ntp...
Author: hawk Date: Sun Mar 19 20:48:06 2006 GMT Module: admin Tag: AC-branch Log message: - rdate, rdate-bsd, ntp-client and tmpwatch must exist on first CD Files affected: admin/ftp: poldek-iso.priority (1.8.2.8 - 1.8.2.9) Diffs: Index: admin/ftp/poldek-iso.priority diff -u admin/ftp/poldek-iso.priority:1.8.2.8 admin/ftp/poldek-iso.priority:1.8.2.9 --- admin/ftp/poldek-iso.priority:1.8.2.8 Mon Mar 13 22:32:50 2006 +++ admin/ftp/poldek-iso.priority Sun Mar 19 21:48:01 2006 @@ -87,6 +87,7 @@ ncftp -5 ncompress -5 net-tools -5 +ntp-client -5 nmap -5 openssh-5 openssh-clients-5 @@ -112,6 +113,8 @@ quota -5 rc-boot-5 rc-scripts -5 +rdate -5 +rdate-bsd -5 reiserfsprogs -5 rpm-5 rpm-utils -5 @@ -135,6 +138,7 @@ telnet -5 terminfo -5 time -5 +tmpwatch -5 unace -5 unarj -5 unrar -5 CVS-web: http://cvs.pld-linux.org/admin/ftp/poldek-iso.priority?r1=1.8.2.8r2=1.8.2.9f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/ui/ui-functions
Author: hawk Date: Sun Mar 19 22:05:12 2006 New Revision: 7239 Modified: bootdisk/trunk/batch-installer/ui/ui-functions Log: - avoid loading parted if it is already loaded Modified: bootdisk/trunk/batch-installer/ui/ui-functions == --- bootdisk/trunk/batch-installer/ui/ui-functions (original) +++ bootdisk/trunk/batch-installer/ui/ui-functions Sun Mar 19 22:05:12 2006 @@ -330,7 +330,11 @@ fi echo ok /tmp/load_parted_result - + + if test -x /bin/parted ; then +return + fi + # hmm, should load parted if installer-validate-source; then if installer-prep-source; then ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
