[Frugalware-git] frugalware-current: moonlight-2.0-3-x86_64 * added x86_64 to archs() and subarchs() * fixing sha1sums
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0dbd4a03b5bda9969a69e576ca5d727ef624a72f
commit 0dbd4a03b5bda9969a69e576ca5d727ef624a72f
Author: Devil505 devil505li...@gmail.com
Date: Mon Dec 28 10:18:42 2009 +0100
moonlight-2.0-3-x86_64
* added x86_64 to archs() and subarchs()
* fixing sha1sums
diff --git a/source/xlib-extra/moonlight/FrugalBuild
b/source/xlib-extra/moonlight/FrugalBuild
index ff54b5e..36a2844 100644
--- a/source/xlib-extra/moonlight/FrugalBuild
+++ b/source/xlib-extra/moonlight/FrugalBuild
@@ -7,7 +7,7 @@ USE_DEVEL=${USE_DEVEL:-n}
#MOONLIGHT_OVERRIDES=shapecache=yes,converter=ffmpeg firefox'
pkgname=moonlight
-pkgrel=2
+pkgrel=3
pkgdesc=Moonlight is an open source implementation of Microsoft Silverlight
for Unix systems.
url=http://www.go-mono.com/moonlight/;
depends=('gtk+2' 'libxau' 'libxdmcp' 'freetype2' 'alsa-lib' 'libstdc++'
'libxdamage' 'libxext' 'libxml2' \
@@ -16,13 +16,13 @@ makedepends=('firefox' 'zip' 'gsf-sharp'
'gtksourceview-sharp' 'monodoc'\
'xulrunner')
options=('scriptlet')
groups=('xlib-extra')
-archs=('i686')
+archs=('i686' 'x86_64')
subpkgs=($pkgname-mozilla)
subdescs=('moonlight extension for Mozilla')
subdepends=(firefox mono)
subgroups=('xlib-extra')
-subarchs=('i686')
+subarchs=('i686 x86_64')
if ! Fuse $USE_DEVEL; then
pkgver=2.0
@@ -33,8 +33,8 @@ if ! Fuse $USE_DEVEL; then
silverlight-ff3-quirks.user.js)
Finclude mono
sha1sums=('7345749a4415c731abbe55f0b507f772421ea75a' \
- '34f39e24af152921c1c7877c4b92af414ca25ad1' \
- '25dfe9878597ef47cf1febcaa2adf13b10cf203f' \
+ '76769a65fb1237cb4f2f613fa63eb307e12d385c' \
+ '2f41e32983835858f489ea7737ff4ee03c3cf06c' \
'c22294f495294351ae5e2ba3c64797de536d7369')
else
pkgver=0.8.2_svn121479
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: psmisc-22.9-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13bd3c3246e459b36fbd288d5dae9db8719bbc24
commit 13bd3c3246e459b36fbd288d5dae9db8719bbc24
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Dec 28 12:18:57 2009 +0100
psmisc-22.9-1-i686
- version bump
diff --git a/source/base/psmisc/FrugalBuild b/source/base/psmisc/FrugalBuild
index a52517e..c4e414e 100644
--- a/source/base/psmisc/FrugalBuild
+++ b/source/base/psmisc/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna vmik...@frugalware.org
pkgname=psmisc
-pkgver=22.8
+pkgver=22.9
pkgrel=1
pkgdesc=Miscellaneous procfs tools
depends=('ncurses=5.6-4')
@@ -18,5 +18,5 @@ build()
Frm /usr/{man/man1/pidof.1,bin/pidof}
}
-sha1sums=('bce327dc1dad257a67c2fbe9ca7bf227d6d52a51')
+sha1sums=('aed1bd0631239c4f8e28764ad55d4b4ad02671f0')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: evolution-data-server-2.28.2-1-ppc *disable broken gtk-doc for ppc
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=113a4328dc9b999efe0b2410a13bf26b4d9fc20a
commit 113a4328dc9b999efe0b2410a13bf26b4d9fc20a
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 13:18:10 2009 +0100
evolution-data-server-2.28.2-1-ppc
*disable broken gtk-doc for ppc
diff --git a/source/gnome/evolution-data-server/FrugalBuild
b/source/gnome/evolution-data-server/FrugalBuild
index d410475..042ed27 100644
--- a/source/gnome/evolution-data-server/FrugalBuild
+++ b/source/gnome/evolution-data-server/FrugalBuild
@@ -8,21 +8,30 @@ pkgdesc=Evolution Data Server provides a central location
for addressbook and c
depends=('nss=3.12' 'libsoup=2.28.0' 'libgweather=2.28.0'
'libgnomeui=2.24.2' \
'heimdal=1.2.1' 'gnome-keyring=2.28.0' \
'db=4.7.25' 'gnutls=2.8' 'libical')
-makedepends=('intltool' 'gtk-doc=1.11' 'openldap=2.3.24')
+makedepends=('intltool' 'openldap=2.3.24')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
sha1sums=('dd2f35ed6765651c9daf0e709e0e9d65604d1eed')
-subpkgs=('evolution-data-server-ldap' $pkgname-docs)
-subdescs=('Evolution Data Server LDAP extensions.' Evolution Data Server
Documentation)
+subpkgs=('evolution-data-server-ldap')
+subdescs=('Evolution Data Server LDAP extensions.')
subrodepends=($pkgname=$pkgver )
-subdepends=(libldap=2.3.4 )
-subgroups=('gnome' 'docs-extra gnome-docs')
-subarchs=('x86_64 i686 ppc' 'x86_64 i686 ppc')
+subdepends=(libldap=2.3.4)
+subgroups=('gnome')
+subarchs=('x86_64 i686 ppc')
+
+if [ $CARCH == ppc ]; then
+ subpkgs=(${subpk...@]} $pkgname-docs)
+ subdescs=(${subdes...@]} Evolution Data Server Documentation)
+ subdepends=(${subdepen...@]} )
+ subgroups=(${subgrou...@]} 'docs-extra gnome-docs')
+ subarchs=(${subarc...@]} 'x86_64 i686')
+ makedepends=(${makedepen...@]} 'gtk-doc')
+fi
build() {
- Fbuild --with-openldap=yes --enable-nss=yes --enable-gtk-doc \
+ Fbuild --with-openldap=yes --enable-nss=yes \
--enable-nntp=yes --enable-smime=yes --enable-ipv6=yes --disable-debug \
--with-krb5=/usr --with-libdb=/usr --enable-gnome-keyring --enable-calendar=yes
Fsplit evolution-data-server-ldap usr/lib/libexchange-storage*
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: pacman.c * replace strlen call with check for null terminator
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e43d37d1b9712972cf304b72153ee5988e536af5
commit e43d37d1b9712972cf304b72153ee5988e536af5
Author: James Buren r...@frugalware.org
Date: Sun Dec 27 03:26:40 2009 -0600
pacman.c * replace strlen call with check for null terminator
diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c
index c8c7beb..3987d0d 100644
--- a/lib/libpacman/pacman.c
+++ b/lib/libpacman/pacman.c
@@ -1201,7 +1201,7 @@ int pacman_parse_config(char *file, pacman_cb_db_register
callback, const char *
while(fgets(line, PATH_MAX, fp)) {
linenum++;
_pacman_strtrim(line);
- if(strlen(line) == 0 || line[0] == '#') {
+ if(line[0] == '\0' || line[0] == '#') {
continue;
}
if((ptr = strchr(line, '#'))) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: Merge remote branch 'origin/master' into pacman-merge
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=5a86b3855b6006fe0f955dd14b500dffaace7813 commit 5a86b3855b6006fe0f955dd14b500dffaace7813 Merge: 41feb20 e43d37d Author: Michel Hermier herm...@frugalware.org Date: Mon Dec 28 12:32:02 2009 +0100 Merge remote branch 'origin/master' into pacman-merge ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] pacman-g2: Renamed some files to match pacman-g1 a little more.
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4c57d608907a2847d72f5913069b5b8e2bf958fd commit 4c57d608907a2847d72f5913069b5b8e2bf958fd Author: Michel Hermier herm...@frugalware.org Date: Mon Dec 28 13:18:47 2009 +0100 Renamed some files to match pacman-g1 a little more. diff --git a/doc/libpacman.txt b/doc/libpacman.3.txt similarity index 100% rename from doc/libpacman.txt rename to doc/libpacman.3.txt diff --git a/doc/pacman-g2.txt b/doc/pacman-g2.8.txt similarity index 100% rename from doc/pacman-g2.txt rename to doc/pacman-g2.8.txt diff --git a/scripts/makepkg b/scripts/makepkg.sh.in similarity index 100% rename from scripts/makepkg rename to scripts/makepkg.sh.in ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-decorator-3.1.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74aa989593490940eb03aebb53986657d299c33a
commit 74aa989593490940eb03aebb53986657d299c33a
Author: exceed exceed.ced...@gmail.com
Date: Mon Dec 28 14:29:20 2009 +0100
python-decorator-3.1.2-1-i686
* New package
diff --git a/source/devel-extra/python-decorator/FrugalBuild
b/source/devel-extra/python-decorator/FrugalBuild
new file mode 100644
index 000..62d44d4
--- /dev/null
+++ b/source/devel-extra/python-decorator/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: exceed exceed.ced...@gmail.com
+
+pkgname=python-decorator
+_F_archive_name=decorator
+pkgver=3.1.2
+pkgrel=1
+pkgdesc=Simplify the usage of python decorators for the average programmer
+url=http://pypi.python.org/pypi/decorator;
+depends=( 'python=2.6')
+groups=('devel-extra')
+archs=('i686')
+up2date=Flastarchive
http://pypi.python.org/packages/source/d/${_F_archive_name}/ .tar.gz
+source=(http://pypi.python.org/packages/source/d/decorator/${_F_archive_name}-${pkgver}.tar.gz)
+sha1sums=('daa9d392dd2169d96888d7d776dd8beb90d2581a')
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: wireless_tools-29-2-i686 *disable useless redifine iniline (break ppc)
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56b3bc82690e124404929313197a974c0bd2e098
commit 56b3bc82690e124404929313197a974c0bd2e098
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 14:36:26 2009 +
wireless_tools-29-2-i686
*disable useless redifine iniline (break ppc)
diff --git a/source/base/wireless_tools/Disable_redifineinline.diff
b/source/base/wireless_tools/Disable_redifineinline.diff
new file mode 100644
index 000..b521765
--- /dev/null
+++ b/source/base/wireless_tools/Disable_redifineinline.diff
@@ -0,0 +1,38 @@
+--- wireless_tools.29/iwlib.h~ 2007-06-22 18:01:04.0 +
wireless_tools.29/iwlib.h 2009-12-27 22:12:51.0 +
+@@ -60,35 +60,6 @@
+ /* Private copy of Wireless extensions (in this directoty) */
+ #include wireless.h
+
+-/* Make gcc understant that when we say inline, we mean it.
+- * I really hate when the compiler is trying to be more clever than me,
+- * because in this case gcc is not able to figure out functions with a
+- * single call site, so not only I have to tag those functions inline
+- * by hand, but then it refuse to inline them properly.
+- * Total saving for iwevent : 150B = 0.7%.
+- * Fortunately, in gcc 3.4, they now automatically inline static functions
+- * with a single call site. Hurrah !
+- * Jean II */
+-#undef IW_GCC_HAS_BROKEN_INLINE
+-#if __GNUC__ == 3
+-#if __GNUC_MINOR__ = 1 __GNUC_MINOR__ 4
+-#define IW_GCC_HAS_BROKEN_INLINE 1
+-#endif/* __GNUC_MINOR__ */
+-#endif/* __GNUC__ */
+-/* However, gcc 4.0 has introduce a new feature, when compiling with
+- * '-Os', it does not want to inline iw_ether_cmp() and friends.
+- * So, we need to fix inline again !
+- * Jean II */
+-#if __GNUC__ == 4
+-#define IW_GCC_HAS_BROKEN_INLINE 1
+-#endif/* __GNUC__ */
+-/* Now, really fix the inline */
+-#ifdef IW_GCC_HAS_BROKEN_INLINE
+-#ifdef inline
+-#undef inline
+-#endif/* inline */
+-#define inlineinline __attribute__((always_inline))
+-#endif/* IW_GCC_HAS_BROKEN_INLINE */
+
+ #ifdef __cplusplus
+ extern C {
diff --git a/source/base/wireless_tools/FrugalBuild
b/source/base/wireless_tools/FrugalBuild
index a18f393..f696f72 100644
--- a/source/base/wireless_tools/FrugalBuild
+++ b/source/base/wireless_tools/FrugalBuild
@@ -4,19 +4,22 @@
pkgname=wireless_tools
pkgver=29
-pkgrel=1
+pkgrel=2
pkgdesc=Wireless tools, including iwconfig
url=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html;
depends=('glibc')
groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date=lynx -dump
http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html|grep -om1
'wireless_tools.\(.*\).tar.gz'|sed 's/.*ls.\(.*\).t.*/\1/'
-source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$pkgver.tar.gz)
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
+source=(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$pkgver.tar.gz
\
+ Disable_redifineinline.diff)
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710' \
+ '7fa36cd48b1c455ea95d28aa4a8ba64b156b133a')
build()
{
Fcd $pkgname.$pkgver
+ Fpatchall
make PREFIX=/usr CFLAGS=$CFLAGS -I. || return 1
make PREFIX=$Fdestdir/usr install
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mpeg4ip-1.6-6-x86_64 * pkgrel++ (corrupted packages)
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3726b3fc1879f1d2f8edeae06c37f37f5b5ff44 commit f3726b3fc1879f1d2f8edeae06c37f37f5b5ff44 Author: Devil505 devil505li...@gmail.com Date: Mon Dec 28 14:50:21 2009 +0100 mpeg4ip-1.6-6-x86_64 * pkgrel++ (corrupted packages) diff --git a/source/multimedia/mpeg4ip/FrugalBuild b/source/multimedia/mpeg4ip/FrugalBuild index d81faf7..60dbede 100644 --- a/source/multimedia/mpeg4ip/FrugalBuild +++ b/source/multimedia/mpeg4ip/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mpeg4ip pkgver=1.6 -pkgrel=5 +pkgrel=6 pkgdesc=mpeg4ip provides an end-to-end system to explore streaming multimedia Finclude sourceforge depends=(libmp4v2=$pkgver) ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: x264-20090416-1-ppc *added ppc build fix *added gcc patch (patch only ppc branch of x264)
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8d689275830455181fd7f1d6e2f3847e29a1d71
commit b8d689275830455181fd7f1d6e2f3847e29a1d71
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 16:38:32 2009 +0100
x264-20090416-1-ppc
*added ppc build fix
*added gcc patch (patch only ppc branch of x264)
diff --git a/source/xmultimedia/x264/FrugalBuild
b/source/xmultimedia/x264/FrugalBuild
index 3528120..e8a576c 100644
--- a/source/xmultimedia/x264/FrugalBuild
+++ b/source/xmultimedia/x264/FrugalBuild
@@ -12,19 +12,24 @@ makedepends=('gpac' 'yasm')
groups=('xmultimedia')
archs=('i686' 'x86_64' 'ppc')
up2date=$pkgver
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-sha1sums=('007bc7917c61e2e815094458865077f9a5b5d19b')
+source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2
gcc4.2.diff)
+sha1sums=('007bc7917c61e2e815094458865077f9a5b5d19b' \
+ '150dc05f5e26b42a9e61a304bbd3643ad215447f')
+
+Fconfopts=$Fconfopts --enable-pthread \
+--enable-shared \
+--enable-mp4-output \
+--enable-visualize \
+--enable-pic
+
+if [ $CARCH == ppc ]; then
+ export CFLAGS=$CFLAGS -flax-vector-conversions
+fi
build() {
Fcd $pkgname-snapshot-$pkgver-2245/
- Fbuild \
- --enable-pthread \
- --enable-shared \
- --enable-mp4-output \
- --enable-visualize \
- --enable-pic
-
-Fmakeinstall bindir=/usr/bin libdir=/usr/lib includedir=/usr/include
DESTDIR=$Fdestdir
+ Fbuild
+ Fmakeinstall bindir=/usr/bin libdir=/usr/lib includedir=/usr/include
DESTDIR=$Fdestdir
}
# optimization OK
diff --git a/source/xmultimedia/x264/gcc4.2.diff
b/source/xmultimedia/x264/gcc4.2.diff
new file mode 100644
index 000..bbec85c
--- /dev/null
+++ b/source/xmultimedia/x264/gcc4.2.diff
@@ -0,0 +1,45 @@
+From: Guillaume Poirier gpoir...@mplayerhq.hu
+Date: Tue, 21 Apr 2009 21:18:44 + (+)
+Subject: fix incompatible types in initialization compilation issues with
GCC 4.3 (which...
+X-Git-Url:
http://git.videolan.org/?p=x264.git;a=commitdiff_plain;h=d2e1e1c35c43ea9c90c9211be6202143b69b35b9;hp=4fc8c03ad568efe3dd2f57db33b0863d29cb63a0
+
+fix incompatible types in initialization compilation issues with GCC 4.3
(which is stricter than previous compiler version)
+---
+
+diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
+index 2f7082a..360e71d 100644
+--- a/common/ppc/pixel.c
b/common/ppc/pixel.c
+@@ -1865,7 +1865,7 @@ static int pixel_sa8d_16x16_altivec( uint8_t *pix1, int
i_pix1,
+
+ #define VEC_LOAD_HIGH( p, num )\
+ vec_u8_t pix8_##num = vec_ld( stride*num, p ); \
+-vec_s16_t pix16_s##num = vec_perm(pix8_##num, zero_u8v, perm); \
++vec_s16_t pix16_s##num = (vec_s16_t)vec_perm(pix8_##num, zero_u8v, perm);
\
+ vec_s16_t pix16_d##num;
+
+ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix, int stride, const
vec_u8_t perm )
+X-Git-Url:
http://git.videolan.org/?p=x264.git;a=blobdiff_plain;f=common%2Fppc%2Fpixel.c;h=2f7082a9ccffe533c975e11c2e9e87973ec29de8;hp=51205442d2b9d49540a7ad49712748ff765501ce;hb=4fc8c03ad568efe3dd2f57db33b0863d29cb63a0;hpb=755470584932877c4d5ea1b51c2cc2dbd044b7ca
+
+diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
+index 5120544..2f7082a 100644
+--- a/common/ppc/pixel.c
b/common/ppc/pixel.c
+@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix,
int stride, const vec_u
+ vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6),
VEC_ABSOLUTE(pix16_d7) );
+
+ vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45,
addabs67));
+-vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
++vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12,
sum4_tab);
+
+ vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4);
+ vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4);
+@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix,
int stride, const vec_u
+ VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) )
);
+
+ vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15),
vec_add(addsum26, addsum37) );
+-vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
++vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12,
sum8_tab);
+
+ int sum8 = sum8_tab[3];
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw-initramfs: create_initramfs *fix ModuleFile (ex: libiscsi_tcp!=iscsi_tcp)
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=eff99a7bee3ebb47cf11e2cdd925ae355f5a1417
commit eff99a7bee3ebb47cf11e2cdd925ae355f5a1417
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 18:03:41 2009 +
create_initramfs
*fix ModuleFile (ex: libiscsi_tcp!=iscsi_tcp)
diff --git a/create_initramfs.sh b/create_initramfs.sh
index 5232aed..2828d75 100755
--- a/create_initramfs.sh
+++ b/create_initramfs.sh
@@ -101,7 +101,7 @@ cp -pr /lib/modules/${KV}/modules.*
${DIRTEMP}/work/initramfs/lib/modules/${KV}
for module in ${ALL_MODULES}
do
- ModuleFile=`find /lib/modules/${KV} | grep ${module}${MOD_EXT}`
+ ModuleFile=`find /lib/modules/${KV} -name ${module}${MOD_EXT}`
if find /lib/modules/${KV} | grep /${module}${MOD_EXT} /dev/null 21
then
mkdir -p ${DIRTEMP}/work/initramfs/`dirname ${ModuleFile}`
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnome-keyring-sharp-1.0.0-3-ppc
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef0a0f0b008d97ddb873872391c7ef01132b63b3
commit ef0a0f0b008d97ddb873872391c7ef01132b63b3
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 18:05:13 2009 +0100
gnome-keyring-sharp-1.0.0-3-ppc
added ppc to archs()
diff --git a/source/gnome-extra/gnome-keyring-sharp/FrugalBuild
b/source/gnome-extra/gnome-keyring-sharp/FrugalBuild
index eb211dd..47d3cf5 100644
--- a/source/gnome-extra/gnome-keyring-sharp/FrugalBuild
+++ b/source/gnome-extra/gnome-keyring-sharp/FrugalBuild
@@ -11,7 +11,7 @@
source=(http://ftp.novell.com/pub/mono/sources/gnome-keyring-sharp/$pkgname-$pkg
depends=('mono=2.0.1' 'ndesk-dbus' 'ndesk-dbus-glib' 'gnome-keyring')
options=('scriptlet' 'force')
groups=('gnome-extra')
-archs=('i686' 'x86_64')
+archs=('i686' 'x86_64' 'ppc')
_F_mono_aot=0
Finclude mono
sha1sums=('9900da7b4245710832291bb55139d33a45e15225')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw-initramfs: modules.sh *added module crypto
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=015d0dcb0454cac6c7def4f67d1228bceba5cb00
commit 015d0dcb0454cac6c7def4f67d1228bceba5cb00
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 18:24:23 2009 +
modules.sh
*added module crypto
diff --git a/modules.sh b/modules.sh
index 4c99510..b8b54de 100644
--- a/modules.sh
+++ b/modules.sh
@@ -22,7 +22,10 @@ MODULES_USB=ehci-hcd uhci-hcd ohci-hcd
# ISCSI
MODULES_ISCSI=iscsi_tcp libiscsi libiscsi_tcp be2iscsi
+# CRYPTO (requiert by iscsi)
+MODULES_CRYPTO=crc32c
+
# Filesystems
MODULES_FS=jfs nfs fuse
-ALL_MODULES=${MODULES_FS}${MODULES_USB}${MODULES_PCMCIA}${MODULES_FIREWIRE}${MODULES_NET}${MODULES_WAITSCAN}${MODULES_SCSI}${MODULES_SATA}${MODULES_PATA}${MODULES_MDADM}${MODULES_ISCSI}
+ALL_MODULES=${MODULES_FS}${MODULES_USB}${MODULES_PCMCIA}${MODULES_FIREWIRE}${MODULES_NET}${MODULES_WAITSCAN}${MODULES_SCSI}${MODULES_SATA}${MODULES_PATA}${MODULES_MDADM}${MODULES_ISCSI}${MODULES_CRYPTO}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw-initramfs: modules.sh *added new module
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=278d568fb0e9617d693f80a3f9bc309a762e76f9 commit 278d568fb0e9617d693f80a3f9bc309a762e76f9 Author: bouleetbil bouleet...@frogdev.info Date: Mon Dec 28 19:55:57 2009 + modules.sh *added new module diff --git a/modules.sh b/modules.sh index b8b54de..0b0b562 100644 --- a/modules.sh +++ b/modules.sh @@ -20,7 +20,7 @@ MODULES_PCMCIA=yenta_socket pd6729 i82092 i82365 tcic ide-cs MODULES_USB=ehci-hcd uhci-hcd ohci-hcd # ISCSI -MODULES_ISCSI=iscsi_tcp libiscsi libiscsi_tcp be2iscsi +MODULES_ISCSI=iscsi_tcp libiscsi libiscsi_tcp be2iscsi scsi_transport_iscsi # CRYPTO (requiert by iscsi) MODULES_CRYPTO=crc32c ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: librep-0.90.4-1-i686 * version bump * remove old patch that is no longer needed
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc5f79bd17a80cd22bfb19303134be3ee956284e
commit dc5f79bd17a80cd22bfb19303134be3ee956284e
Author: James Buren r...@frugalware.org
Date: Mon Dec 28 11:51:33 2009 -0600
librep-0.90.4-1-i686
* version bump
* remove old patch that is no longer needed
diff --git a/source/lib-extra/librep/FrugalBuild
b/source/lib-extra/librep/FrugalBuild
index 25104c3..13d22e5 100644
--- a/source/lib-extra/librep/FrugalBuild
+++ b/source/lib-extra/librep/FrugalBuild
@@ -2,16 +2,14 @@
# Maintainer: James Buren r...@frugalware.org
pkgname=librep
-pkgver=0.90.2
+pkgver=0.90.4
pkgrel=1
pkgdesc=a lisp interpreter/system for *NIX
_F_sourceforge_ext='.tar.bz2'
Finclude sourceforge
-source=(${sour...@]} $pkgname-libffi.patch)
depends=('gmp' 'gdbm' 'readline' 'libffi')
groups=('lib-extra')
archs=('i686' 'x86_64')
-sha1sums=('e0a71016567a6ee4c9b85ff4fead3a778a877d24' \
- '8656086765b0cdfbb5128c3158890b988feb7c96')
+sha1sums=('85a4d7938159365322142a78fb6ca264712df09b')
# optimization OK
diff --git a/source/lib-extra/librep/librep-libffi.patch
b/source/lib-extra/librep/librep-libffi.patch
deleted file mode 100644
index 7c89804..000
--- a/source/lib-extra/librep/librep-libffi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur librep-0.90.2/configure librep-0.90.2-2/configure
librep-0.90.2/configure2009-08-25 11:33:59.0 -0500
-+++ librep-0.90.2-2/configure 2009-09-08 04:43:58.0 -0500
-@@ -11999,7 +11999,7 @@
- pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags libffi = $FFI_MIN_VER
-2/dev/null`
- else
-- pkg_failed=yes
-+ pkg_failed=no
- fi
- fi
- else
-@@ -12020,7 +12020,7 @@
- pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs libffi = $FFI_MIN_VER
-2/dev/null`
- else
-- pkg_failed=yes
-+ pkg_failed=no
- fi
- fi
- else
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: sawfish-1.6.0-1-i686 * version bump * remove audiofile dependency * remove custom desktop file, replace with symlink to supplied desktop file * change default tool
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3e74fc90fc70a5c24f0c63594f7b4607bb26d34
commit e3e74fc90fc70a5c24f0c63594f7b4607bb26d34
Author: James Buren r...@frugalware.org
Date: Mon Dec 28 12:31:55 2009 -0600
sawfish-1.6.0-1-i686
* version bump
* remove audiofile dependency
* remove custom desktop file, replace with symlink to supplied desktop file
* change default tool used for playing sound files
* remove deprecated configure options
diff --git a/source/x11-extra/sawfish/FrugalBuild
b/source/x11-extra/sawfish/FrugalBuild
index a67172f..102f8ff 100644
--- a/source/x11-extra/sawfish/FrugalBuild
+++ b/source/x11-extra/sawfish/FrugalBuild
@@ -2,13 +2,13 @@
# Maintainer: James Buren r...@frugalware.org
pkgname=sawfish
-pkgver=1.5.2
+pkgver=1.6.0
pkgrel=1
pkgdesc=Extensible window manager written in lisp.
rodepends=('alsa-utils')
depends=('gtk+2=2.16.2-2' 'libice=1.0.5-2' 'libxft=2.1.13-2' 'libxml2'
-'libxdmcp=1.0.2-2' 'libxau=1.0.4' 'libxdamage=1.1.1-2' 'audiofile'
-'rep-gtk=0.90.0' 'gpm')
+'libxdmcp=1.0.2-2' 'libxau=1.0.4' 'libxdamage=1.1.1-2'
+'rep-gtk=0.90.1' 'gpm')
_F_sourceforge_dirname=sawmill
_F_sourceforge_ext=.tar.bz2
Finclude sourceforge
@@ -16,22 +16,22 @@ url=http://sawfish.wikia.com/;
groups=('x11-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
-Fconfopts=$Fconfopts --disable-gnome-widgets --without-esd
-source=(${sour...@]} $pkgname-session startup $pkgname.desktop
xinitrc.$pkgname)
-
-sha1sums=('7aa4c16756f4644707bc21bb4c75608fc93b5109' \
+source=(${sour...@]} $pkgname-session startup xinitrc.$pkgname)
+sha1sums=('c81d623aa257c99df84fa5d0b1e1352938b24e23' \
'abe3c1ce2bf78e19d7af02faa428a05a17b4431a' \
'ac7544f73f2ea96d85cd0e9ca8a6d24d8bc2734d' \
- '4a718c79c71dcb54cd624dfbf878824ac37a2010' \
'182d1f6c47aa90f85568215b7f39f600067a1a64')
build()
{
+ Fsed /usr/bin/paplay /usr/bin/$pkgname-aplay
+ lisp/sawfish/wm/util/play-audio.jl
Fbuild
Fexe /usr/bin/$pkgname-session
Fexe /etc/X11/xinit/xinitrc.$pkgname
Ffile /usr/share/$pkgname/startup
- Ffile /etc/X11/sessions/$pkgname.desktop
+ Fln /usr/share/applications/$pkgname.desktop
+ /etc/X11/sessions/$pkgname.desktop
Fwrapper exec /usr/bin/aplay -q \\...@\ $pkgname-aplay
}
diff --git a/source/x11-extra/sawfish/sawfish.desktop
b/source/x11-extra/sawfish/sawfish.desktop
deleted file mode 100644
index 391c61b..000
--- a/source/x11-extra/sawfish/sawfish.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Sawfish
-Comment=Extensible window manager written in lisp.
-Exec=sawfish-session
-Icon=
-Type=Application
-
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: rep-gtk-0.90.1-1-i686 * version bump * remove custom build and Fconfopts
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4a81ca771ba93fe198f1bcfb21660a0f2f93c91
commit d4a81ca771ba93fe198f1bcfb21660a0f2f93c91
Author: James Buren r...@frugalware.org
Date: Mon Dec 28 11:58:07 2009 -0600
rep-gtk-0.90.1-1-i686
* version bump
* remove custom build and Fconfopts
diff --git a/source/xlib-extra/rep-gtk/FrugalBuild
b/source/xlib-extra/rep-gtk/FrugalBuild
index a139c6f..d812152 100644
--- a/source/xlib-extra/rep-gtk/FrugalBuild
+++ b/source/xlib-extra/rep-gtk/FrugalBuild
@@ -2,24 +2,17 @@
# Maintainer: James Buren r...@frugalware.org
pkgname=rep-gtk
-pkgver=0.90.0
+pkgver=0.90.1
pkgrel=1
pkgdesc=Gtk 2 bindings for librep.
depends=('glibc' 'gtk+2=2.16.2-2' 'freetype2=2.3.9' 'libxau=1.0.4'
'libxdmcp=1.0.2-2' 'libxdamage=1.1.1-3' 'libxext=1.0.5-3'
-'libxml2' 'librep=0.90.2')
+'libxml2' 'librep=0.90.4')
_F_sourceforge_ext='.tar.bz2'
Finclude sourceforge
groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
-sha1sums=('2b4a4d751becf6aca8cd5863202c23519f5fa2a5')
-Fconfopts=$Fconfopts --without-libglade --without-gnome
-
-build() {
- Fcd
- Fautoreconf
- Fbuild
-}
+sha1sums=('2614028897600ee090f6c7ff7f1c3c9dc7c5a765')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: add msgbox to apply the current network config in netconf plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=2b59178290335c0691c4a506bffe0e571d1917c6
commit 2b59178290335c0691c4a506bffe0e571d1917c6
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:30:02 2009 +0100
add msgbox to apply the current network config in netconf plugin
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 132a50f..fad681d 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -55,7 +55,7 @@ static GtkWidget *viewserver = NULL;
extern GtkWidget *assistant;
-int run_net_config();
+int run_net_config(GList **config);
int is_connected(char *host, int port, int timeouttime);
enum
@@ -319,7 +319,7 @@ int prerun(GList **config)
switch(fwife_question(_(You need an active internet connection ,\n do you want
to configure your network now?)))
{
case GTK_RESPONSE_YES:
- while(run_net_config() == -1) {}
+ while(run_net_config(config) == -1) {}
break;
case GTK_RESPONSE_NO:
break;
@@ -997,9 +997,7 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
- free(host);
- free(newprofile);
- free(interface);
+ free(host);
system(netconfig start);
@@ -1098,7 +1096,7 @@ int select_interface(fwnet_interface_t *interface)
return 0;
}
-int run_net_config()
+int run_net_config(GList **config)
{
char *nettype = NULL;
char *ptr = NULL;
@@ -1119,8 +1117,11 @@ int run_net_config()
return -1;
nettype = ask_nettype();
- if(nettype == NULL)
+ if(nettype == NULL) {
+ free(newprofile);
+ free(newinterface);
return -1;
+ }
if(fwnet_is_wireless_device(newinterface-name)) {
switch(fwife_question(_(It seems that this network card has a wireless
extension.\n\nConfigure your wireless now?)))
@@ -1149,11 +1150,19 @@ int run_net_config()
} else if(!strcmp(nettype, static)) {
configure_static(newinterface);
} else {
+ free(newprofile);
+ free(newinterface);
return -1;
}
- if(post_net_config(newprofile, newinterface) == -1)
+ if(post_net_config(newprofile, newinterface) == -1) {
+ free(newprofile);
+ free(newinterface);
return -1;
+ }
+
+ /* save network profile for later usage in netconf*/
+ data_put(config, netprofile, newprofile);
return 0;
}
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 52afe03..6fc9b1c 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -814,6 +814,20 @@ int prerun(GList **config)
GtkWidget *cellview;
GtkTreeIter iter;
+ fwnet_profile_t *oldprofile = (fwnet_profile_t*)data_get(*config,
netprofile);
+ if(oldprofile != NULL) {
+ switch(fwife_question(_(You can now reconfigure your network
if you want to configure others interfaces or just apply current network
configuration.\n\n\
+ Do you want to apply the current configuration ?)))
+ {
+ case GTK_RESPONSE_YES:
+ newprofile = oldprofile;
+ skip_to_next_plugin();
+ return 0;
+ case GTK_RESPONSE_NO:
+ break;
+ }
+ }
+
cellview = gtk_cell_view_new ();
connectimg = gtk_widget_render_icon (cellview, GTK_STOCK_NETWORK,
GTK_ICON_SIZE_BUTTON, NULL);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: fix return values of run_net_config function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=6dc002426e76f4efe8031290df63320e32e50f36
commit 6dc002426e76f4efe8031290df63320e32e50f36
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:32:57 2009 +0100
fix return values of run_net_config function
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index fad681d..f823ca4 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1106,15 +1106,15 @@ int run_net_config(GList **config)
fwnet_profile_t *newprofile=NULL;
if((newprofile = (fwnet_profile_t*)malloc(sizeof(fwnet_profile_t))) == NULL)
- return -1;
+ return 1;
memset(newprofile, 0, sizeof(fwnet_profile_t));
if((newinterface = (fwnet_interface_t*)malloc(sizeof(fwnet_interface_t))) ==
NULL)
- return -1;
+ return 1;
memset(newinterface, 0, sizeof(fwnet_interface_t));
if(select_interface(newinterface) == -1)
- return -1;
+ return 0;
nettype = ask_nettype();
if(nettype == NULL) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: add netconfig stop if network configuration failed
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=b42573528222ad4bb54bc1d88c4218a63a7bb597
commit b42573528222ad4bb54bc1d88c4218a63a7bb597
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:35:31 2009 +0100
add netconfig stop if network configuration failed
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index f823ca4..724d010 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -997,15 +997,15 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
+ fw_system_interactive(netconfig start);
free(host);
- system(netconfig start);
-
if(is_connected(www.google.org, 80, 5) 1) {
int ret = fwife_question(_(Fwife cannot connect to internet with this
configuration, do you want to apply this configuration anyway?));
if(ret == GTK_RESPONSE_YES) {
return 0;
} else {
+ fw_system_interactive(netconfig stop);
return -1;
}
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: iscsi-2.0_871-1-i686 *new package
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0081bdadd2ae6807dbcb16a315a3a56d4893211c
commit 0081bdadd2ae6807dbcb16a315a3a56d4893211c
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 21:52:29 2009 +
iscsi-2.0_871-1-i686
*new package
diff --git a/source/network-extra/iscsi/CVE-2009-1297.diff
b/source/network-extra/iscsi/CVE-2009-1297.diff
new file mode 100644
index 000..cb9dc55
--- /dev/null
+++ b/source/network-extra/iscsi/CVE-2009-1297.diff
@@ -0,0 +1,32 @@
+--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.0 +0100
utils/iscsi_discovery 2009-10-26 23:11:56.0 +0100
+@@ -104,24 +104,22 @@
+
+ connected=0
+ discovered=0
+- df=/tmp/discovered.$$
+
+ dbg starting discovery to $ip
+- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} ${df}
+- while read portal target
++ disc=$(iscsiadm -m discovery --type sendtargets --portal
${ip}:${port})
++ echo ${disc} | while read portal target
+ do
+ portal=${portal%,*}
+ select_transport
+- done ${df}
++ done
+
+- discovered=$(cat ${df} | wc -l)
++ discovered=$(echo ${disc} | wc -l)
+ if [ ${discovered} = 0 ]; then
+ echo failed to discover targets at ${ip}
+ exit 2
+ else
+ echo discovered ${discovered} targets at ${ip}
+ fi
+- /bin/rm -f ${df}
+ }
+
+ try_login()
+
diff --git a/source/network-extra/iscsi/FrugalBuild
b/source/network-extra/iscsi/FrugalBuild
new file mode 100644
index 000..44023a3
--- /dev/null
+++ b/source/network-extra/iscsi/FrugalBuild
@@ -0,0 +1,36 @@
+# Compiling Time: 0.03 SBU
+# Maintainer: bouleetbil bouleet...@frogdev.info
+
+pkgname=iscsi
+_F_archive_name=open-iscsi
+pkgver=2.0_871
+pkgrel=1
+pkgdesc=Open-iSCSI project is a high performance, transport independent
+url=http://www.open-iscsi.org;
+#don't build modules provides by kernel now
+source=(http://www.open-iscsi.org/bits/$_F_archive_name-${pkgver/_/-}.tar.gz \
+ noModules.diff CVE-2009-1297.diff initiatorname.iscsi rc.iscsid iscsid)
+up2date=Flasttar http://www.open-iscsi.org/bits/;
+depends=('glibc')
+groups=('network-extra')
+archs=('i686')
+sha1sums=('968baf16d4094fb9842bc04b0fe8109103356252' \
+ '8ca923fff93623dff5bb9b3548034699f5f7483e' \
+ 'b71c3fd3096b1654ab250445b7f660176bf7704d' \
+ '7adb8bb034125184c7210d12c6c562069539545a' \
+ '2d8e99f24ec87b923a76af06404567f7cfeb33a5' \
+ '024b307d3a881c2bc07a6e2e599cdd65abe868ba')
+_F_cd_path=$_F_archive_name-${pkgver/_/-}
+backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi'
'etc/sysconfig/iscsid')
+
+build() {
+ Fbuild
+ Fmkdir var/db/iscsi
+ Fmkdir etc/sysconfig/
+ Fdirschmod var/db/iscsi 0700
+ Fcp initiatorname.iscsi etc/iscsi/
+ Fcp iscsid etc/sysconfig/
+ Frcd2 iscsid
+}
+
+# optimization OK
diff --git a/source/network-extra/iscsi/initiatorname.iscsi
b/source/network-extra/iscsi/initiatorname.iscsi
new file mode 100644
index 000..e5cefaf
--- /dev/null
+++ b/source/network-extra/iscsi/initiatorname.iscsi
@@ -0,0 +1,28 @@
+# This file must contain a InitiatorName entry!
+# white space is significent here!
+#InitiatorName=iqn.2005-09.tld.domain.hostname:openiscsi-initiator
+#InitiatorAlias=foobar
+
+# Sample documentation follows:
+
+# The InitiatorName should take the following format
+# iqn.${YEAR}-${MONTH}-${DOMAIN_REVERSED}.${HOSTNAME}:${UNIQUE_STRING}
+# Where YEAR and MONTH are the dates that your domain was registered.
+# You can use WHOIS to find when your domain was registered.
+# If you don't have a real domain in the outside world, invent one, but use
+# .local for your top-level.
+
+# Example case #1:
+# This assumes you own foobar.co.uk.
+# Domain name: foobar.co.uk.
+# Registration date: March 2001
+# Hostname: linux
+#
InitiatorName=iqn.2001-03.uk.co.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216
+
+# Example case #2:
+# This assumes you don't have a domain of your own.
+# Domain name: foobar.local
+# Registration date: March 2001
+# Hostname: linux
+#
InitiatorName=iqn.2001-03.local.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216
+
diff --git a/source/network-extra/iscsi/iscsid
b/source/network-extra/iscsi/iscsid
new file mode 100644
index 000..850f675
--- /dev/null
+++ b/source/network-extra/iscsi/iscsid
@@ -0,0 +1,14 @@
+# /etc/sysconfig/iscsid
+
+# config file to use
+CONFIG_FILE=/etc/iscsi/iscsid.conf
+
+# you need to specify an initiatorname in the file
+INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
+
+# options to pass to iscsid
+OPTS=-i ${INITIATORNAME_FILE}
+
+# Start automatic targets when iscsid is started
+AUTOSTARTTARGETS=yes
+
diff --git a/source/network-extra/iscsi/noModules.diff
b/source/network-extra/iscsi/noModules.diff
new file mode 100644
index 000..ff1bef3
--- /dev/null
+++
[Frugalware-git] fw-initramfs: init *added modules iscsi
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=ff891a0a672e1999042d32d002f3aac293aaf0e5
commit ff891a0a672e1999042d32d002f3aac293aaf0e5
Author: bouleetbil bouleet...@frogdev.info
Date: Mon Dec 28 22:09:15 2009 +
init
*added modules iscsi
diff --git a/init b/init
index e3fa97c..973c3ce 100755
--- a/init
+++ b/init
@@ -100,6 +100,11 @@ do
loadmodules)
LOADMULES=1
;;
+ # iscsi
+ #TODO: Add binary
+ loadmodules)
+ ISCSI=1
+ ;;
esac
done
@@ -132,8 +137,25 @@ then
done
fi
+#load iscsi
+if [ ${ISCSI} -eq '1' ];
+then
+ for module in $MODULES_ISCSI
+ do
+ echo -ne ${BOLD} ::${NORMAL} Scanning for ${module}...
+ modprobe ${module} 2/dev/null 1 /dev/null
+ if [ $? == 0 ]; then
+ echo ${module} module loaded
+ fi
+ backup
+ echo -ne ${NORMAL}
+ done
+fi
+
#resume
+#TODO add it
#swsusp_resume
+#TODO add it
mkdir -p /sys
cd /sys
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: remove interface name from interface glist
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=a02828ecadb59285c522bc4f9db47ce569dab2be
commit a02828ecadb59285c522bc4f9db47ce569dab2be
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 22:09:45 2009 +0100
remove interface name from interface glist
(interface name is in fwnet_interface_t struct)
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 6fc9b1c..5f667eb 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -664,14 +664,12 @@ int add_interface(GtkWidget *button, gpointer data)
return 0;
}
- for(i=0;ig_list_length(interfaceslist); i+=2) {
- if(!strcmp((char*)g_list_nth_data(interfaceslist, i), iface)) {
+ for(i=0;ig_list_length(interfaceslist); i++) {
+ if(!strcmp(((fwnet_interface_t*)g_list_nth_data(interfaceslist,
i))-name, iface)) {
int retquest = fwife_question(_(This interface has been already configured! Do
you want to configure it again?));
if(retquest == GTK_RESPONSE_YES) {
free(g_list_nth_data(interfaceslist, i));
- free(g_list_nth_data(interfaceslist, i+1));
- interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
- interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
+ interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
break;
} else {
return -1;
@@ -689,8 +687,7 @@ int add_interface(GtkWidget *button, gpointer data)
if(nettype == NULL)
return -1;
- if(strcmp(nettype, lo)) {
- interfaceslist = g_list_append(interfaceslist, strdup(iface));
+ if(strcmp(nettype, lo)) {
interfaceslist = g_list_append(interfaceslist, newinterface);
}
@@ -732,16 +729,19 @@ int del_interface(GtkWidget *button, gpointer data)
GtkTreeModel *model = NULL;
GtkTreeIter iter;
char *nameif;
+ int i;
GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(viewif));
model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(viewif)));
if(gtk_tree_selection_get_selected(selection, model, iter)) {
gtk_tree_model_get (model, iter, COLUMN_NET_NAME, nameif, -1);
- GList * elem = g_list_find_custom(interfaceslist,
(gconstpointer) nameif, cmp_str);
- gint i = g_list_position(interfaceslist, elem);
- interfaceslist = g_list_delete_link (interfaceslist,
g_list_nth(interfaceslist, i));
- interfaceslist = g_list_delete_link (interfaceslist,
g_list_nth(interfaceslist, i));
+ for(i = 0;i g_list_length(interfaceslist); i++) {
+
if(!strcmp(((fwnet_interface_t*)g_list_nth_data(interfaceslist, i))-name,
nameif)) {
+ free(g_list_nth_data(interfaceslist, i));
+ interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
+ }
+ }
gtk_list_store_set (GTK_LIST_STORE (model), iter, COLUMN_NET_TYPE, , -1);
}
@@ -858,7 +858,7 @@ int run(GList **config)
int i, ret;
sprintf(newprofile-name, default);
- for(i = 1; ig_list_length(interfaceslist); i+=2) {
+ for(i = 0; ig_list_length(interfaceslist); i++) {
newprofile-interfaces = g_list_append(newprofile-interfaces,
(fwnet_interface_t *) g_list_nth_data(interfaceslist, i));
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: liberation-fonts-1.05.2.20091019-1-i686 * version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1b3ac1ae28a01f2d8295561841605cbc242b182
commit e1b3ac1ae28a01f2d8295561841605cbc242b182
Author: Devil505 devil505li...@gmail.com
Date: Mon Dec 28 22:32:56 2009 +0100
liberation-fonts-1.05.2.20091019-1-i686
* version bump
diff --git a/source/xlib-extra/liberation-fonts/FrugalBuild
b/source/xlib-extra/liberation-fonts/FrugalBuild
index d55d321..e1fa453 100644
--- a/source/xlib-extra/liberation-fonts/FrugalBuild
+++ b/source/xlib-extra/liberation-fonts/FrugalBuild
@@ -2,23 +2,23 @@
# Maintainer: Devil505 devil505li...@gmail.com
pkgname=liberation-fonts
-pkgver=1.04
+pkgver=1.05.2.20091019
pkgrel=1
pkgdesc=Red Hat Liberation fonts
-url=https://www.redhat.com/promo/fonts/;
-depends=('fontconfig' 'freetype2')
+url=https://fedorahosted.org/liberation-fonts/;
+makedepends=('elinks' 'fontforge')
+_F_fonts_subdir=TTF
+Finclude fonts
+install=liberation-fonts.install
groups=('xlib-extra')
archs=('i686' 'x86_64')
-install=liberation-fonts.install
-up2date=$pkgver
-#up2date=elinks -dump https://fedorahosted.org/releases/l/i/liberation-fonts/
| Flasttar
-#i will uncomment it until devel version comes stable
+up2date=elinks -dump https://fedorahosted.org/releases/l/i/liberation-fonts/
| Flasttar
source=(https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-$pkgver.tar.gz)
-sha1sums=('097882c92e3260742a3dc3bf033792120d8635a3')
+sha1sums=('f027e78d31102dfa07d72679848ad766cb341774')
build() {
- Fcd
- Fmkdir usr/share/fonts/TTF/
- Finstallrel 644 *.ttf usr/share/fonts/TTF/
+ Fcd $pkgname-$pkgver
+ Fmake
+ cd ttf || Fdie
+ Finstallrel 644 *.ttf usr/share/fonts/TTF/
}
-
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mathgl-1.10-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=837564e7eff8842feda048c298864771c8500d50
commit 837564e7eff8842feda048c298864771c8500d50
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 23:15:34 2009 +0100
mathgl-1.10-1-i686
* version bump
* move some includes to subpkgs
diff --git a/source/xlib-extra/mathgl/FrugalBuild
b/source/xlib-extra/mathgl/FrugalBuild
index 7191ebc..c05c8c3 100644
--- a/source/xlib-extra/mathgl/FrugalBuild
+++ b/source/xlib-extra/mathgl/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=mathgl
-pkgver=1.9
-pkgrel=3
+pkgver=1.10
+pkgrel=1
pkgdesc=A library for making high-quality scientific graphics, fast data
plotting and handling of large data arrays
archs=('i686' 'x86_64')
depends=('gsl' 'libjpeg' 'libgif' 'libpng' 'libgomp' 'libgl' 'hdf5')
@@ -16,7 +16,7 @@ _F_archive_grepv=1.9.0.1
Finclude sourceforge python
source=($source mgloctave.install)
Fconfopts=$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg
--enable-gif --enable-hdf5 --enable-python --enable-octave
-sha1sums=('79c733a50c235c14ba089ef5583985b83383114f' \
+sha1sums=('f0a541c66fefd44336fea183c6ed97346eb15d03' \
'9c9d3b6b62fb8f0dd0e33639d9ad3d160820547e')
subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut' 'mathgl-python'
'mathgl-octave')
@@ -41,13 +41,16 @@ build() {
# Qt interface
Fsplit mathgl-qt usr/bin/mgl_qt_example
Fsplit mathgl-qt usr/lib/libmgl-qt.*
+ Fsplit mathgl-qt usr/include/mgl/mgl_qt.h
# Fltk interface
Fsplit mathgl-fltk usr/lib/libmgl-fltk.*
Fsplit mathgl-fltk usr/bin/mgl_fltk_example
Fsplit mathgl-fltk usr/bin/mglview
+ Fsplit mathgl-fltk usr/include/mgl/mgl_fltk.h
# Glut interface
Fsplit mathgl-glut usr/bin/mgl_glut_example
Fsplit mathgl-glut usr/lib/libmgl-glut.*
+ Fsplit mathgl-glut usr/include/mgl/mgl_glut.h
# Python interface
Fsplit mathgl-python usr/lib/python*
# Octave interface
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw-initramfs: TODO *copy configuration of iscsi into ramfs
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=780e100274457628b458a5bdff4284fd5220addb commit 780e100274457628b458a5bdff4284fd5220addb Author: bouleetbil bouleet...@frogdev.info Date: Mon Dec 28 23:20:22 2009 + TODO *copy configuration of iscsi into ramfs diff --git a/TODO b/TODO index a3499d3..a655f17 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ *create a livecd *added lvm support *added splashy - +*added parameter to create_initramfs.sh for copy configuration into ramfs ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
