[Frugalware-git] fw32: fw32.c: initial draft
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=b7ab08976516eeec28a6dafe1b7ee968404415e5
commit b7ab08976516eeec28a6dafe1b7ee968404415e5
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 02:56:36 2011 -0500
fw32.c: initial draft
diff --git a/fw32.c b/fw32.c
new file mode 100644
index 000..7a2e9b2
--- /dev/null
+++ b/fw32.c
@@ -0,0 +1,18 @@
+#include stdlib.h
+#include stdio.h
+#include stdarg.h
+
+static void
+error(const char *fmt,...)
+{
+ va_list args;
+
+ va_start(args,fmt);
+
+ vfprintf(stderr,fmt,args);
+
+ va_end(args);
+
+ exit(EXIT_FAILURE);
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add mkdir_parents
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=d3d2cc8b07036985021ea55812a45d7f306cff01
commit d3d2cc8b07036985021ea55812a45d7f306cff01
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 03:35:04 2011 -0500
fw32.c: add mkdir_parents
diff --git a/fw32.c b/fw32.c
index 7a2e9b2..0fb53fd 100644
--- a/fw32.c
+++ b/fw32.c
@@ -1,18 +1,68 @@
#include stdlib.h
#include stdio.h
#include stdarg.h
+#include stdbool.h
+#include string.h
+#include sys/stat.h
+#include limits.h
+#include assert.h
static void
error(const char *fmt,...)
{
- va_list args;
+ va_list args;
- va_start(args,fmt);
+ assert(fmt);
- vfprintf(stderr,fmt,args);
+ va_start(args,fmt);
- va_end(args);
+ vfprintf(stderr,fmt,args);
- exit(EXIT_FAILURE);
+ va_end(args);
+
+ exit(EXIT_FAILURE);
}
+static void
+mkdir_parents(const char *s)
+{
+ char path[PATH_MAX], *p;
+ struct stat st;
+
+ assert(s *s == '/');
+
+ snprintf(path,sizeof path,%s,s);
+
+ for( p = strchr(path + 1,'/') ; p *p ; p = strchr(p + 1,'/') )
+ {
+*p = 0;
+
+if(!stat(path,st))
+{
+ if(S_ISDIR(st.st_mode))
+ {
+*p = '/';
+
+continue;
+ }
+
+ error(Parent directory exists and is not a directory: %s\n,path);
+}
+
+if(mkdir(path,0755))
+ error(Failed to create parent directory: %s\n,path);
+
+*p = '/';
+ }
+
+ if(!stat(path,st))
+ {
+if(S_ISDIR(st.st_mode))
+ return;
+
+error(Directory exists and is not a directory: %s\n,path);
+ }
+
+ if(mkdir(path,0755))
+error(Failed to create directory: %s\n,path);
+}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: simply mkdir_parents loop
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=fe70a98480afc1b4f7672b45371a3dd23c1cef4d
commit fe70a98480afc1b4f7672b45371a3dd23c1cef4d
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 03:38:18 2011 -0500
fw32.c: simply mkdir_parents loop
diff --git a/fw32.c b/fw32.c
index 0fb53fd..241e234 100644
--- a/fw32.c
+++ b/fw32.c
@@ -33,26 +33,20 @@ mkdir_parents(const char *s)
snprintf(path,sizeof path,%s,s);
- for( p = strchr(path + 1,'/') ; p *p ; p = strchr(p + 1,'/') )
+ for( p = strchr(path + 1,'/') ; p *p ; *p = '/', p = strchr(p + 1,'/') )
{
*p = 0;
if(!stat(path,st))
{
if(S_ISDIR(st.st_mode))
- {
-*p = '/';
-
continue;
- }
error(Parent directory exists and is not a directory: %s\n,path);
}
if(mkdir(path,0755))
error(Failed to create parent directory: %s\n,path);
-
-*p = '/';
}
if(!stat(path,st))
@@ -66,3 +60,5 @@ mkdir_parents(const char *s)
if(mkdir(path,0755))
error(Failed to create directory: %s\n,path);
}
+
+int main(int argc,char **argv) { mkdir_parents(argv[1]); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add is_mounted
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=6af4d224fab78659c13ab1903827f0addd96f557
commit 6af4d224fab78659c13ab1903827f0addd96f557
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 03:52:48 2011 -0500
fw32.c: add is_mounted
diff --git a/fw32.c b/fw32.c
index 241e234..d1d8d87 100644
--- a/fw32.c
+++ b/fw32.c
@@ -7,6 +7,8 @@
#include limits.h
#include assert.h
+#define FW32_ROOT /usr/lib/fw32
+
static void
error(const char *fmt,...)
{
@@ -61,4 +63,47 @@ mkdir_parents(const char *s)
error(Failed to create directory: %s\n,path);
}
+static bool
+is_mounted(const char *path)
+{
+ FILE *f;
+ char line[LINE_MAX], *s, *e;
+ bool found;
+
+ assert(path);
+
+ f = fopen(/proc/mounts,rb);
+
+ if(!f)
+error(Cannot open /proc/mounts for reading.\n);
+
+ found = false;
+
+ while(fgets(line,sizeof line,f))
+ {
+s = strchr(line,' ');
+
+if(!s)
+ continue;
+
+e = strchr(++s,' ');
+
+if(!e)
+ continue;
+
+*e = 0;
+
+if(strcmp(s,path))
+{
+ found = true;
+
+ break;
+}
+ }
+
+ fclose(f);
+
+ return found;
+}
+
int main(int argc,char **argv) { mkdir_parents(argv[1]); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: empathy-3.3.1-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=eed2667c1f03ee53a766c547101e5367f06831f4
commit eed2667c1f03ee53a766c547101e5367f06831f4
Author: Baste ba...@frugalware.org
Date: Wed Nov 2 09:51:06 2011 +0100
empathy-3.3.1-1-x86_64
* Version bump
diff --git a/source/gnome/empathy/FrugalBuild b/source/gnome/empathy/FrugalBuild
index 73b31e9..59be7bb 100644
--- a/source/gnome/empathy/FrugalBuild
+++ b/source/gnome/empathy/FrugalBuild
@@ -7,8 +7,8 @@ USE_SENDTO=${USE_SENDTO:-n}
#Sendto have be merged to nautilus should wait
pkgname=empathy
-pkgver=3.2.1
-pkgrel=3
+pkgver=3.3.1
+pkgrel=1
pkgdesc=Empathy consists of a rich set of reusable instant messaging widgets
depends=('telepathy-glib' 'libxml2' 'enchant' 'ca-certificates' \
'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'e2fsprogs' \
@@ -37,7 +37,7 @@ if Fuse $USE_MAP; then
depend=(${depends[@]} libchamplain geoclue)
Fconfopts=${Fconfopts[@]} --enable-map=yes
fi
-sha1sums=('d4d8fd0ba7f16882ee87518eaa303a1731524528')
+sha1sums=('8e718b0f74c4a3959341192d346d0bd4ff8e7bb4')
replaces=('galaxium' 'gossip')
if Fuse $USE_SENDTO; then
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add FW32_DIRS from shell implementation
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=dd3e9841f31fa274b9a97d3eae8da5bce636bd32
commit dd3e9841f31fa274b9a97d3eae8da5bce636bd32
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 04:00:25 2011 -0500
fw32.c: add FW32_DIRS from shell implementation
diff --git a/fw32.c b/fw32.c
index d1d8d87..16d1ed7 100644
--- a/fw32.c
+++ b/fw32.c
@@ -7,7 +7,25 @@
#include limits.h
#include assert.h
-#define FW32_ROOT /usr/lib/fw32
+static const char *FW32_ROOT = /usr/lib/fw32;
+
+static const char *FW32_DIRS[] =
+{
+ /proc,
+ /sys,
+ /dev,
+ /etc,
+ /home,
+ /tmp,
+ /var/tmp,
+ /var/cache/pacman-g2/pkg,
+ /usr/share/kde,
+ /usr/share/icons,
+ /usr/share/fonts,
+ /usr/share/themes,
+ /media,
+ /mnt
+};
static void
error(const char *fmt,...)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: simplify error handling in mkdir_parents
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=fd0925f22b65095426dabb9b33162c76c10d86ad
commit fd0925f22b65095426dabb9b33162c76c10d86ad
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 04:08:45 2011 -0500
fw32.c: simplify error handling in mkdir_parents
diff --git a/fw32.c b/fw32.c
index 16d1ed7..d4ae7e0 100644
--- a/fw32.c
+++ b/fw32.c
@@ -5,10 +5,13 @@
#include string.h
#include sys/stat.h
#include limits.h
+#include errno.h
#include assert.h
static const char *FW32_ROOT = /usr/lib/fw32;
+static const char *FW32_CONFIG = /etc/fw32/pacman-g2.conf;
+
static const char *FW32_DIRS[] =
{
/proc,
@@ -47,7 +50,6 @@ static void
mkdir_parents(const char *s)
{
char path[PATH_MAX], *p;
- struct stat st;
assert(s *s == '/');
@@ -57,28 +59,20 @@ mkdir_parents(const char *s)
{
*p = 0;
-if(!stat(path,st))
-{
- if(S_ISDIR(st.st_mode))
-continue;
+errno = 0;
- error(Parent directory exists and is not a directory: %s\n,path);
-}
+mkdir(path,0755);
-if(mkdir(path,0755))
- error(Failed to create parent directory: %s\n,path);
+if(errno errno != EEXIST)
+error(Failed to create parent directory: %s:
%s\n,path,strerror(errno));
}
- if(!stat(path,st))
- {
-if(S_ISDIR(st.st_mode))
- return;
+ errno = 0;
-error(Directory exists and is not a directory: %s\n,path);
- }
+ mkdir(path,0755);
- if(mkdir(path,0755))
-error(Failed to create directory: %s\n,path);
+ if(errno errno != EEXIST)
+error(Failed to create directory: %s: %s\n,path,strerror(errno));
}
static bool
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mailutils-2.2-1-x86_64 *new package
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29dee0b385c604bd0bcf752f765f0b6e257135e1
commit 29dee0b385c604bd0bcf752f765f0b6e257135e1
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 10:26:26 2011 +0100
mailutils-2.2-1-x86_64
*new package
diff --git a/source/network-extra/mailutils/FrugalBuild
b/source/network-extra/mailutils/FrugalBuild
new file mode 100644
index 000..bd494aa
--- /dev/null
+++ b/source/network-extra/mailutils/FrugalBuild
@@ -0,0 +1,20 @@
+# Compiling Time: 0.56 SBU
+# Maintainer: bouleetbil bouleet...@frogdev.info
+
+pkgname=mailutils
+pkgver=2.2
+pkgrel=1
+pkgdesc=Mailutils is a swiss army knife of electronic mail handling. It
offers a rich set of utilities and daemons for processing the e-mail.
+url=http://http://mailutils.org/;
+depends=('pam' 'gnutls' 'libldap' 'guile' 'pysqlite2')
+makedepends=('openldap' 'emacs' 'krb5')
+groups=('network-extra')
+archs=('i686' 'x86_64')
+Fconfopts=$Fconfopts --with-gdbm --with-gnutls \
+ --libexecdir=/usr/lib/$pkgname --without-fribidi \
+ --without-tcp-wrappers
+up2date=Flasttar http://mailutils.org/download.html;
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 python.diff)
+signatures=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2.sig '')
+
+# optimization OK
diff --git a/source/network-extra/mailutils/python.diff
b/source/network-extra/mailutils/python.diff
new file mode 100644
index 000..9264161
--- /dev/null
+++ b/source/network-extra/mailutils/python.diff
@@ -0,0 +1,23 @@
+--- python/libmu_py/Makefile.in.org2009-09-10 21:18:43.0 +0200
python/libmu_py/Makefile.in2010-01-21 19:51:58.0 +0100
+@@ -122,7 +122,7 @@
+ $(DESTDIR)$(lispdir)
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(pythonexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-c_api_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++c_api_la_DEPENDENCIES = libmu_py.la
+ am_c_api_la_OBJECTS = c_api.lo
+ c_api_la_OBJECTS = $(am_c_api_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_$(V))
+--- python/libmu_py/Makefile.in.org2010-01-21 19:54:19.0 +0100
python/libmu_py/Makefile.in2010-01-21 20:29:56.0 +0100
+@@ -886,7 +886,7 @@
+ echo rm -f \$${dir}/so_locations\; \
+ rm -f $${dir}/so_locations; \
+ done
+-install-pythonexecLTLIBRARIES: $(pythonexec_LTLIBRARIES)
++install-pythonexecLTLIBRARIES: $(pythonexec_LTLIBRARIES)
install-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ test -z $(pythonexecdir) || $(MKDIR_P) $(DESTDIR)$(pythonexecdir)
+ @list='$(pythonexec_LTLIBRARIES)'; test -n $(pythonexecdir) || list=;
\
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
Re: [Frugalware-git] fw32: fw32.c: simplify error handling in mkdir_parents
This code is totally broken.
Setting errno is a no go in glibc, it's a read only variable (on some
glibc it is a macro to a function)
As a consequence, your mkdir checking is broken, you should really check
mkdir returned values and then check errno on failure value.
Also you could make a small private static function that does the mkdir
and error checking to avoid code duplication.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=fd0925f22b65095426dabb9b33162c76c10d86ad
commit fd0925f22b65095426dabb9b33162c76c10d86ad
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 04:08:45 2011 -0500
fw32.c: simplify error handling in mkdir_parents
diff --git a/fw32.c b/fw32.c
index 16d1ed7..d4ae7e0 100644
--- a/fw32.c
+++ b/fw32.c
@@ -5,10 +5,13 @@
#include string.h
#include sys/stat.h
#include limits.h
+#include errno.h
#include assert.h
static const char *FW32_ROOT = /usr/lib/fw32;
+static const char *FW32_CONFIG = /etc/fw32/pacman-g2.conf;
+
static const char *FW32_DIRS[] =
{
/proc,
@@ -47,7 +50,6 @@ static void
mkdir_parents(const char *s)
{
char path[PATH_MAX], *p;
- struct stat st;
assert(s *s == '/');
@@ -57,28 +59,20 @@ mkdir_parents(const char *s)
{
*p = 0;
-if(!stat(path,st))
-{
- if(S_ISDIR(st.st_mode))
-continue;
+errno = 0;
- error(Parent directory exists and is not a directory: %s\n,path);
-}
+mkdir(path,0755);
-if(mkdir(path,0755))
- error(Failed to create parent directory: %s\n,path);
+if(errno errno != EEXIST)
+error(Failed to create parent directory: %s:
%s\n,path,strerror(errno));
}
- if(!stat(path,st))
- {
-if(S_ISDIR(st.st_mode))
- return;
+ errno = 0;
-error(Directory exists and is not a directory: %s\n,path);
- }
+ mkdir(path,0755);
- if(mkdir(path,0755))
-error(Failed to create directory: %s\n,path);
+ if(errno errno != EEXIST)
+error(Failed to create directory: %s: %s\n,path,strerror(errno));
}
static bool
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
Re: [Frugalware-git] fw32: fw32.c: add FW32_DIRS from shell implementation
FW32_ROOT should be a macro defined by configure, and defaulted as
something like: LIBPREFIX/fw32.
Another thing, can this variable be overwritted by an env variable ? would
make sense for some system I think.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=dd3e9841f31fa274b9a97d3eae8da5bce636bd32
commit dd3e9841f31fa274b9a97d3eae8da5bce636bd32
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 04:00:25 2011 -0500
fw32.c: add FW32_DIRS from shell implementation
diff --git a/fw32.c b/fw32.c
index d1d8d87..16d1ed7 100644
--- a/fw32.c
+++ b/fw32.c
@@ -7,7 +7,25 @@
#include limits.h
#include assert.h
-#define FW32_ROOT /usr/lib/fw32
+static const char *FW32_ROOT = /usr/lib/fw32;
+
+static const char *FW32_DIRS[] =
+{
+ /proc,
+ /sys,
+ /dev,
+ /etc,
+ /home,
+ /tmp,
+ /var/tmp,
+ /var/cache/pacman-g2/pkg,
+ /usr/share/kde,
+ /usr/share/icons,
+ /usr/share/fonts,
+ /usr/share/themes,
+ /media,
+ /mnt
+};
static void
error(const char *fmt,...)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cyrus-sasl-2.1.25-2-x86_64 *enable pam support as well :D
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4eaf5fcf71002123eb3f4b40e0ca7e9226d34d99
commit 4eaf5fcf71002123eb3f4b40e0ca7e9226d34d99
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 13:18:45 2011 +0100
cyrus-sasl-2.1.25-2-x86_64
*enable pam support as well :D
diff --git a/source/network/cyrus-sasl/FrugalBuild
b/source/network/cyrus-sasl/FrugalBuild
index 032871b..e285b12 100644
--- a/source/network/cyrus-sasl/FrugalBuild
+++ b/source/network/cyrus-sasl/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=cyrus-sasl
pkgver=2.1.25
-pkgrel=1
+pkgrel=2
pkgdesc=SASL Authentication mechanism
url=http://ftp.andrew.cmu.edu/pub/cyrus-mail/;
-depends=('openssl=1.0.0' 'gdbm')
+depends=('openssl=1.0.0' 'gdbm' 'pam')
backup=(etc/sysconfig/saslauthd)
groups=('network')
archs=('i686' 'x86_64' 'ppc' 'arm')
@@ -36,7 +36,7 @@ build()
--enable-plain \
--disable-anon \
--with-saslauthd=/var/run/courier \
- --with-pam=no \
+ --with-pam \
--with-dblib=gdbm \
--with-gdbm=/usr
Frm /usr/share/man/cat8
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: pam-mysql-0.7RC1-1-x86_64 *new package
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ece521a870ee533acc4902affcb5e93d38366ed
commit 6ece521a870ee533acc4902affcb5e93d38366ed
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 13:37:26 2011 +0100
pam-mysql-0.7RC1-1-x86_64
*new package
diff --git a/source/network-extra/pam-mysql/FrugalBuild
b/source/network-extra/pam-mysql/FrugalBuild
new file mode 100644
index 000..8ea4f9a
--- /dev/null
+++ b/source/network-extra/pam-mysql/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 0.56 SBU
+# Maintainer: bouleetbil bouleet...@frogdev.info
+
+pkgname=pam-mysql
+pkgver=0.7RC1
+pkgrel=1
+pkgdesc=Mailutils is a swiss army knife of electronic mail handling. It
offers a rich set of utilities and daemons for processing the e-mail.
+depends=('pam' 'libmysqlclient')
+archs=('x86_64' 'i686')
+makedepends=('mysql')
+groups=(network-extra)
+_F_sourceforge_name=pam_mysql
+Finclude sourceforge
+sha1sums=('a139c4b4bf1a2e591a016069405428eb862f7690')
+Fconfopts=$Fconfopts --with-pam-mods-dir=/lib/security
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mailutils-2.2-1-x86_64 *fix url
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c837a67addb6e105138baea74f6213fbaee6581
commit 4c837a67addb6e105138baea74f6213fbaee6581
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 13:43:36 2011 +0100
mailutils-2.2-1-x86_64
*fix url
diff --git a/source/network-extra/mailutils/FrugalBuild
b/source/network-extra/mailutils/FrugalBuild
index bd494aa..139259d 100644
--- a/source/network-extra/mailutils/FrugalBuild
+++ b/source/network-extra/mailutils/FrugalBuild
@@ -5,7 +5,7 @@ pkgname=mailutils
pkgver=2.2
pkgrel=1
pkgdesc=Mailutils is a swiss army knife of electronic mail handling. It offers
a rich set of utilities and daemons for processing the e-mail.
-url=http://http://mailutils.org/;
+url=http://mailutils.org/;
depends=('pam' 'gnutls' 'libldap' 'guile' 'pysqlite2')
makedepends=('openldap' 'emacs' 'krb5')
groups=('network-extra')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: vinagre-3.3.1-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=153f66a3d0d0c50224dfd034c03b21a61e795a5f
commit 153f66a3d0d0c50224dfd034c03b21a61e795a5f
Author: Baste ba...@frugalware.org
Date: Wed Nov 2 14:53:58 2011 +0100
vinagre-3.3.1-1-x86_64
* Version bump
diff --git a/source/gnome/vinagre/FrugalBuild b/source/gnome/vinagre/FrugalBuild
index ec3337e..8f47be0 100644
--- a/source/gnome/vinagre/FrugalBuild
+++ b/source/gnome/vinagre/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=vinagre
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
pkgdesc=VNC Client for the GNOME Desktop
depends=('gtk3-vnc' 'gnutls' 'libgcrypt' 'libavahi-ui' 'atk' \
'pango' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \
@@ -19,7 +19,7 @@ _F_gnome_iconcache=y
Finclude gnome gnome-scriptlet
groups=('gnome')
archs=('i686' 'x86_64')
-sha1sums=('5a183280a71ce787cc0529e9c6764f185a975141')
+sha1sums=('1e748ff023f3d8b7abd257635c5dd73203fb828a')
unset MAKEFLAGS
Fconfopts=$Fconfopts --enable-rdp --enable-ssh --disable-static
--disable-applet
replaces=('tsclient')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: vino-3.3.1-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=07b102841dfe8f3a4f2f86d5bd5ca12ed27e6bd9
commit 07b102841dfe8f3a4f2f86d5bd5ca12ed27e6bd9
Author: Baste ba...@frugalware.org
Date: Wed Nov 2 15:26:48 2011 +0100
vino-3.3.1-1-x86_64
* Version bump
diff --git a/source/gnome/vino/FrugalBuild b/source/gnome/vino/FrugalBuild
index 186f4af..cadb22b 100644
--- a/source/gnome/vino/FrugalBuild
+++ b/source/gnome/vino/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=vino
-pkgver=3.2.1
+pkgver=3.3.1
pkgrel=1
pkgdesc=An integrated VNC server for GNOME
depends=('gnutls=2.8' 'avahi-glib' 'libxtst' 'libxdamage' 'libnotify' \
@@ -18,6 +18,6 @@ _F_gnome_devel=y
Finclude gnome gnome-scriptlet
Fconfopts=$Fconfopts --enable-http-server=yes --enable-session-support=yes
--enable-avahi \
--enable-debug=no --enable-gnome-keyring=yes
-sha1sums=('7b6ce8591695ed620e94c0ff2eb47912b300cbb8')
+sha1sums=('d1225e3df17ca1626e2cf9efc8aba972dccc6196')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: cheese-3.3.1-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=6d0c055e96a3905f874655169a886867203ce906
commit 6d0c055e96a3905f874655169a886867203ce906
Author: Baste ba...@frugalware.org
Date: Wed Nov 2 15:54:21 2011 +0100
cheese-3.3.1-1-x86_64
* Version bump
diff --git a/source/gnome/cheese/FrugalBuild b/source/gnome/cheese/FrugalBuild
index 99cf029..b8428b6 100644
--- a/source/gnome/cheese/FrugalBuild
+++ b/source/gnome/cheese/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=cheese
-pkgver=3.2.1
+pkgver=3.3.1
pkgrel=1
pkgdesc=Cheese is a Photobooth-inspired GNOME application for taking pictures
and videos from a webcam.
url=http://www.gnome.org/projects/cheese;
@@ -18,6 +18,6 @@ _F_gnome_iconcache=y
_F_gnome_desktop=y
_F_gnome_glib=y
Finclude gnome gnome-scriptlet
-sha1sums=('2e09d063188ed1cf23e2e8ba12499c8bc2699450')
+sha1sums=('9bde1593d80bd9c12d0a34575226be6493e6cc87')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] gnometesting: gnome-games-3.3.1-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=c8a1ddc9b680b9c323a38d207cf3e3e964bc4fb9
commit c8a1ddc9b680b9c323a38d207cf3e3e964bc4fb9
Author: Baste ba...@frugalware.org
Date: Wed Nov 2 16:18:13 2011 +0100
gnome-games-3.3.1-1-x86_64
* Version bump
diff --git a/source/gnome-extra/gnome-games/FrugalBuild
b/source/gnome-extra/gnome-games/FrugalBuild
index 2f7c66f..779488c 100644
--- a/source/gnome-extra/gnome-games/FrugalBuild
+++ b/source/gnome-extra/gnome-games/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=gnome-games
-pkgver=3.2.1
+pkgver=3.3.1
pkgrel=1
pkgdesc=Games for GNOME
url=http://www.gnome.org/;
@@ -26,7 +26,7 @@ _F_gnome_desktop=y
_F_gnome_iconcache=y
Finclude gnome gnome-scriptlet
Fconfopts=$Fconfopts --with-scores-group=users --with-scores-user=root
-sha1sums=('e61a9c9fdbdf857679af58f8668062a8c5527668')
+sha1sums=('e29aecab72f5d47e784736fcb053e0a6f6a8275e')
conflicts=('glchess')
replaces=('gnono')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: tools/mirror: don't hardwire fst_root
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=979747284139657e9b87680d10754e594df0fce7
commit 979747284139657e9b87680d10754e594df0fce7
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Nov 2 17:07:39 2011 +0100
tools/mirror: don't hardwire fst_root
diff --git a/tools/mirror b/tools/mirror
index 2f692e4..3ec6a72 100755
--- a/tools/mirror
+++ b/tools/mirror
@@ -1,9 +1,11 @@
#!/bin/sh
+. /etc/repoman.conf
+
+ver=$(readlink /pub/frugalware/frugalware-stable|sed 's/frugalware/maint/')
for i in current stable
do
- cd ~/git/$i
- ver=$(readlink /pub/frugalware/frugalware-stable|sed
's/frugalware/maint/')
+ cd $fst_root/$i
[ $i = current ] git fetch /pub/frugalware/frugalware-stable
master:${ver%%/}
git push --mirror github:frugalware/frugalware-$i.git
git push --mirror gitorious:frugalware/frugalware-$i.git
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: sudo-1.8.3-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74bd85cf2bf1bad1a2cd41fbfae673a57c07f342
commit 74bd85cf2bf1bad1a2cd41fbfae673a57c07f342
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Nov 2 17:10:49 2011 +0100
sudo-1.8.3-2-i686
- version bump
diff --git a/source/apps/sudo/FrugalBuild b/source/apps/sudo/FrugalBuild
index 90cde50..6003353 100644
--- a/source/apps/sudo/FrugalBuild
+++ b/source/apps/sudo/FrugalBuild
@@ -3,8 +3,8 @@
pkgname=sudo
pkgver=1.8.3
-pkgextraver=
-pkgrel=1
+pkgextraver=p1
+pkgrel=2
pkgdesc=Give limited root privileges to certain users
url=http://www.sudo.ws/;
depends=('glibc=2.8-3')
@@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc' 'arm')
backup=('etc/sudoers')
up2date=Flasttar $url/sudo/stable.html
source=(http://www.sudo.ws/$pkgname/dist/$pkgname-$pkgver$pkgextraver.tar.gz
sudo.sh)
-sha1sums=('59cd7204fc6dbc2ac6024eb2ec43d4d7747d52df' \
+sha1sums=('2a7ad912aa8a31706796e5bff8813e4fc7505333' \
'ff0745f1d95c614f55e8fd1f85abee2486cf24ba')
build()
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: frugalware-icon-theme-1.6.2-1-i686 * version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=31960c2fbd2386491624e8735295636b1ac371a8
commit 31960c2fbd2386491624e8735295636b1ac371a8
Author: Devil505 devil505li...@gmail.com
Date: Wed Nov 2 17:12:59 2011 +0100
frugalware-icon-theme-1.6.2-1-i686
* version bump
diff --git a/source/xlib/frugalware-icon-theme/FrugalBuild
b/source/xlib/frugalware-icon-theme/FrugalBuild
index 099ff15..fb315cb 100644
--- a/source/xlib/frugalware-icon-theme/FrugalBuild
+++ b/source/xlib/frugalware-icon-theme/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Devil505 devil505li...@gmail.com
pkgname=frugalware-icon-theme
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
pkgdesc=Official Frugalware Icon Theme (for GNOME, XFCE4 and LXDE)
depends=('librsvg' 'libpng')
@@ -11,7 +11,7 @@ groups=('xlib')
archs=('i686' 'x86_64' 'ppc')
up2date=Flasttar $url
source=($url/$pkgname-$pkgver.tar.xz)
-sha1sums=('a76f5bd9fcfb9e901d28ce8ea8d20310467031fc')
+sha1sums=('31c26415bccaec9042b614a3116c05696f1fbfda')
replaces=('frugalware-gnome-icon-theme')
provides=('frugalware-gnome-icon-theme')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mpage-2.5.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=377a1aa0ca1ed860445f26972c66611271b4c7db
commit 377a1aa0ca1ed860445f26972c66611271b4c7db
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Nov 2 17:25:52 2011 +0100
mpage-2.5.5-1-i686
- bin, dead since 2007
diff --git a/source/apps-extra/mpage/FrugalBuild
b/source/apps-extra/mpage/FrugalBuild
deleted file mode 100644
index 0f359a5..000
--- a/source/apps-extra/mpage/FrugalBuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: Miklos Vajna vmik...@frugalware.org
-
-pkgname=mpage
-pkgver=2.5.5
-pkgrel=1
-pkgdesc=Many to one page printing utility
-url=http://www.mesa.nl/download.html;
-depends=()
-groups=('apps-extra')
-archs=('i686' 'x86_64')
-up2date=lynx -dump $url|grep Mpage|sed 's/.* \(.*\)/\1/;q'
-source=(http://www.mesa.nl/pub/mpage/mpage-$pkgver.tgz)
-
-build()
-{
- Fcd
- make CFLAGS=$CFLAGS \$(DEFS) PREFIX=/usr MANDIR=/usr/man/man1 ||
return 1
- make PREFIX=$Fdestdir/usr MANDIR=$Fdestdir/usr/share/man/man1
install || return 1
-}
-
-# optimization OK
-sha1sums=('5c53a31c2dc40c867ba1ca31e9912c99c90f3e74')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: yasm-1.2.0-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cea62de0f75c8a0379292a6bed34a16c348dfcd
commit 6cea62de0f75c8a0379292a6bed34a16c348dfcd
Author: Pingax pin...@frugalware.fr
Date: Wed Nov 2 17:33:14 2011 +0100
yasm-1.2.0-1-i686
* Version bump
diff --git a/source/devel-extra/yasm/FrugalBuild
b/source/devel-extra/yasm/FrugalBuild
index 4a1791b..58c5480 100644
--- a/source/devel-extra/yasm/FrugalBuild
+++ b/source/devel-extra/yasm/FrugalBuild
@@ -1,8 +1,8 @@
-# Compiling time: 0.14 SBU
+# Compiling time: 0.15 SBU
# Maintainer: voroskoi voros...@frugalware.org
pkgname=yasm
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=1
pkgdesc=Yasm is a complete rewrite of the NASM assembler under BSD License
with x64 support.
url=http://www.tortall.net/projects/yasm/wiki;
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64' 'ppc' 'arm')
license=BSD
up2date=lynx -dump ${url}/Download |grep http.*tar.gz |Flasttar
source=(http://www.tortall.net/projects/yasm/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('8b252d2a50f6d0d8fe13997183596c3cd7589db9')
+sha1sums=('773d28f27f83c44ac35079add0d3167ca6c1def8')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: util.sh
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b5ae33aa6204d24e28ceb358cc86f44f7bcf2cb
commit 9b5ae33aa6204d24e28ceb358cc86f44f7bcf2cb
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 17:49:15 2011 +0100
util.sh
* Add infodir option handling for configure scripts.
diff --git a/source/include/util.sh b/source/include/util.sh
index 7ecadf0..00011ea 100644
--- a/source/include/util.sh
+++ b/source/include/util.sh
@@ -92,6 +92,7 @@ Fdestdir=$startdir/pkg
Fprefix=/usr
Fsysconfdir=/etc
Flocalstatedir=/var
+Finfodir=/usr/share/info
Fmandir=/usr/share/man
Fmenudir=/usr/share/applications
Farchs=('i686' 'x86_64' 'ppc' 'arm')
@@ -811,6 +812,7 @@ Fconf() {
Fconfoptstryset sysconfdir $Fsysconfdir
Fconfoptstryset localstatedir $Flocalstatedir
Fconfoptstryset docdir /usr/share/doc/$pkgname-$pkgver
+ Fconfoptstryset infodir $Finfodir
Fconfoptstryset mandir $Fmandir
Fconfoptstryset build $Fbuildchost
Fexec $_F_conf_configure $Fconfopts $@ || Fdie
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: Merge remote-tracking branch 'current/master'
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=5af1d842dd7181ba90d4c9947e3e8320818559a7 commit 5af1d842dd7181ba90d4c9947e3e8320818559a7 Merge: 3ae2155 9b5ae33 Author: Melko me...@frugalware.org Date: Wed Nov 2 18:09:55 2011 +0100 Merge remote-tracking branch 'current/master' ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: readline5-5.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b752a94cdfaa6fe9984ce279f00e7bdb9d35d50
commit 6b752a94cdfaa6fe9984ce279f00e7bdb9d35d50
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 18:17:15 2011 +0100
readline5-5.2-1-i686
* Add migration package for readline.
diff --git a/source/base/readline5/FrugalBuild
b/source/base/readline5/FrugalBuild
new file mode 100644
index 000..7a7ff33
--- /dev/null
+++ b/source/base/readline5/FrugalBuild
@@ -0,0 +1,32 @@
+# Compiling Time: 0.12 SBU
+# Maintainer: Miklos Vajna vmik...@frugalware.org
+
+pkgname=readline5
+_F_archive_name=readline
+pkgver=5.2
+pkgrel=1
+pkgdesc=GNU readline library
+url=http://www.gnu.org/;
+depends=('ncurses=5.6-4')
+groups=('base' 'chroot-core')
+archs=('i686' 'x86_64' 'ppc' 'arm')
+up2date=$pkgver
+source=(ftp://ftp.gnu.org/pub/gnu/$_F_archive_name/$_F_archive_name-$pkgver.tar.gz)
+sha1sums=('18f3412c73068509d5f491b7b4535aeaf9522834')
+
+build()
+{
+ Fconf
+
+ make SHLIB_LIBS=-lncurses || Fdie
+
+ unset MAKEFLAGS
+ Fmakeinstall
+ Ffileschmod usr/lib/lib*.so.$pkgver 0755
+
+ Frm /usr/include/ \
+ /usr/lib/\*.{a,so} \
+ $Finfodir $Fmandir
+}
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: * kde version bump - 4.7.3 * update sha1sums
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=186229c8acfef432e71582a4940a4671602b4132 commit 186229c8acfef432e71582a4940a4671602b4132 Author: Melko me...@frugalware.org Date: Wed Nov 2 18:22:01 2011 +0100 * kde version bump - 4.7.3 * update sha1sums diff --git a/source/include/kde-version.sh b/source/include/kde-version.sh index e3b7fb1..b443cf6 100644 --- a/source/include/kde-version.sh +++ b/source/include/kde-version.sh @@ -17,81 +17,81 @@ ### -_F_kdever_ver=4.7.2 +_F_kdever_ver=4.7.3 _F_kdever_qt=4.7.4 # Must be done in 2 lines else bash barfs on the floor declare -gA _F_kdever_sha1sums _F_kdever_sha1sums=( - [blinken]='ec0418900c5d71d64f65407b898d740a5255ce08' - [cantor]='5cb978903868d3dbda7367fec21a02818f693d6b' - [gwenview]='ce1c3df9e9147d81ce250c41e7d9a328993d8632' - [kalgebra]='4507b93e67d953705f7fe5eccec10868971a79ca' - [kalzium]='3e750692964ca76da9ccbae5bdc263413a22a049' - [kamera]='354d45d8f62c66bef0bc04c6e6e2056060ca7f0b' - [kanagram]='0dd7dd66f87f99a5f0f2b4a7340c4690240c2478' - [kate]='467b0558f1f86d0b210abd2d78c94cbe63b8579d' - [kbruch]='db4959982db7a36fef61798978d8c885408a3e3f' - [kcolorchooser]='64bd726f1bbb1e771bc037d9929f0eba098d844d' - [kdeaccessibility]='7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1' - [kdeadmin]='c96ddd94a4903b035e73b3e958e6b189ca173fe9' - [kdeartwork]='a536d530e1f97d14f11ada47435f3e194e93beae' - [kde-baseapps]='b52937ad8e5e4be884cc76f265c19964f461ac2c' - [kdegames]='a84be8406fce38cf5b172c320904bb1cbe59e729' - [kdegraphics-strigi-analyzer]='6094f33788f619e316efad7bc3eb6178b1b28121' - [kdegraphics-thumbnailers]='281c84bcec1ce4b02148caf164c28fbc47d9b11b' - [kdelibs]='4b074633cbf69752fda96018514ee771efe8f18b' - [kdemultimedia]='2fc12558284fe95da63e24c73612846c6c1d31e1' - [kdenetwork]='59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c' - [kdepim]='41983556eb54a740a20d274878006ace5bc73c1c' - [kdepimlibs]='9ad72ec123c2837783e6836e8c79210c658d2536' - [kdepim-runtime]='f82886a63c48d718f30d60bd76ea7ac97f17a4c3' - [kdeplasma-addons]='e1504ed7e21da8982610f42e70c3028b77ede6f1' - [kde-runtime]='4d0b1883a2f65cc9472c4788c24e6b241f3b8828' - [kdesdk]='b6259b46fed642c35e1c1d1f90712084141ca441' - [kdetoys]='51213ffadf0326863aad82d9d581a2c9997dda58' - [kdeutils]='52ce9b6b5f2c20475f46b6f7378ca4c530df37b4' - [kde-wallpapers]='41398c918112e266c365c7269a6eb40795a2de19' - [kdewebdev]='82910da01dc84e86134d0dbae23b4bf66b565faa' - [kde-workspace]='afd37b2f583690e391828c1ceb7311e2e8d37c6f' - [kgamma]='3f8cf9bf169a0bc058d0de610bfa4910c54ef475' - [kgeography]='843322c2dd1131122abf03d226b87ec31217ed36' - [khangman]='24d3c41b0cf0aaf68ad053b0e701d7bc3df8bd0f' - [kig]='2234ddb85e8c52214f9fdb5eb25f9491e23c7d86' - [kimono]='2c2c331991e2b42101957ecfd13a18fbd4f86a68' - [kiten]='f6d76b2c15fdf47090db15303413114180358f39' - [klettres]='44a0fa094b90da19c5b0acc25da1150c0ff02b1a' - [kmplot]='dc496d88d6e062f7ecbf6f41187df95aa374fe9b' - [kolourpaint]='d4ec3e463ea3d50731e9fc87cc52eec50bc67ff8' - [konsole]='20150963cc5ebd2f2c13a617a37e018440e0f18c' - [korundum]='091cfd121e41d4edf38eab31e2dca65656e7349d' - [kross-interpreters]='7dba16c2e5e18c955d2fc40536d6a40bc4872cff' - [kruler]='acd3b77bf68fb409f456322d8a68a9d59d1014cb' - [ksaneplugin]='0a35cd7818089b31772dc974dc01a936e91c7d80' - [ksnapshot]='b6b3978639f7f3c06cf5b5653d9a367e38a70cec' - [kstars]='bc51179a16fc2337d1dacab4c1d291042fc0b69c' - [ktouch]='d5e0abd7defece0f455818c7bc53c50730419c46' - [kturtle]='cc86eb08310e8ff591ebb394d08ffc214c264206' - [kwordquiz]='f9450b1b7f539955e55877d96b37424c8abe576e' - [libkdcraw]='9e32ee20a1d201e55aacc5a1fb1de87ad50f3579' - [libkdeedu]='51f8ce8847b71674244f7620536939ba4f36d476' - [libkexiv2]='fbd158168c219cbe1009019d2a33376fca951a5e' - [libkipi]='a75cd016c2d9faa71b2867cb4b3eed40edfb3b85' - [libksane]='223182cf23fc29a10ff2f1ce7756aecf4258b41c' - [marble]='2b6353ff589d66dcf95a3eb79059275f620e03b2' - [mobipocket]='554dabf927e406aeff5e495b8eb7445a080d3195' - [okular]='5bc14efec8d00429a45a807a5bc839ffc783a10f' - [oxygen-icons]='0bb63c06b8b13c9061400099e4056bbd1ef0eb23' - [parley]='65fab5b04f2b0a3598c764ab138acb3c335cbb48' - [perlkde]='a355563b55dc2dd004373a39853af38cda0d005d' - [perlqt]='cde0c6b325e62d26ee6bd2f3f25d01e0563197c9' - [pykde4]='cc7844851110697f06da60cf4a1ee527eda76087' - [qtruby]='1d13c0dd79a2c90c9e964e23fee3573c9397bd4d' - [qyoto]='f002a31fcdcaa94af02bbf5e368e79463974e467' - [rocs]='19f2bf19dfe7a0787180c3fc9d1f32c14316f985' - [smokegen]='f2f605b2ca40403529b9065e745ebb1d9b7e0fcb' - [smokekde]='8874744db367dd5c9d7a8783f662b6283b69dc1f' -
[Frugalware-git] frugalware-current: blobwars-1.19-2-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5d8be7f51ca5eebe7fdf053c5b5137a92f3
commit f5d8be7f51ca5eebe7fdf053c5b5137a92f3
Author: Pingax pin...@frugalware.fr
Date: Wed Nov 2 18:24:09 2011 +0100
blobwars-1.19-2-i686
* Version bump
diff --git a/source/games-extra/blobwars/FrugalBuild
b/source/games-extra/blobwars/FrugalBuild
index 1957d64..29f0466 100644
--- a/source/games-extra/blobwars/FrugalBuild
+++ b/source/games-extra/blobwars/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: AlexExtreme a...@alex-smith.me.uk
pkgname=blobwars
-pkgver=1.17
+pkgver=1.19
pkgextraver=-1
pkgrel=2
pkgdesc=In Blob Wars: Metal Blob Solid, you take on the role of a fearless
Blob agent, Bob.
@@ -10,9 +10,9 @@ url=http://www.parallelrealities.co.uk/projects/blobWars.php;
depends=('sdl' 'sdlimage=1.2.10-2' 'sdl_mixer' 'sdl_ttf' 'zlib' 'sdl_net')
groups=('games-extra')
archs=('i686' 'x86_64')
-up2date=lynx -dump $url | grep -m2 .tar.gz | Flasttar
-source=(http://www.parallelrealities.co.uk/download/$pkgname/$pkgname-$pkgver$pkgextraver.tar.gz)
-sha1sums=('0541c4f6e4b9ca7222dc66594c054db8219e3e5f')
+_F_gnome_iconcache=y
+Finclude sourceforge gnome-scriptlet
+sha1sums=('4fb40c133ad8ad6536d96ee33b2750130892590e')
_F_cd_path=$pkgname-$pkgver
build() {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: readline-6.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1fcd1a8f846cfc17e0f3c51ac87afe5a6d2a232
commit f1fcd1a8f846cfc17e0f3c51ac87afe5a6d2a232
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 18:31:18 2011 +0100
readline-6.2-1-i686
* Bump version (a.k.a let me kill current please)
diff --git a/source/base/readline/FrugalBuild b/source/base/readline/FrugalBuild
index 40d9b5f..7fc7cad 100644
--- a/source/base/readline/FrugalBuild
+++ b/source/base/readline/FrugalBuild
@@ -2,33 +2,36 @@
# Maintainer: Miklos Vajna vmik...@frugalware.org
pkgname=readline
-pkgver=5.2
-pkgrel=4
+pkgver=6.2
+pkgrel=1
pkgdesc=GNU readline library
url=http://www.gnu.org/;
depends=('ncurses=5.6-4')
+rodepends=('readline5')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc' 'arm')
backup=(etc/inputrc)
Fup2gnugz
source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz \
+
ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver-patches/readline62-001 \
inputrc)
-sha1sums=('18f3412c73068509d5f491b7b4535aeaf9522834' \
+sha1sums=('a9761cd9c3da485eb354175fcc2fe35856bc43ac' \
+ '7d264c281f3b43e1c07c020b1785631411ce039e' \
'39e29b3077ddd60dba35376c532ca83e978606a7')
build()
{
+ Fcd
+ Fpatch readline62-001
- Fconf \
- --build=$CHOST
+ Fconf
- make SHLIB_LIBS=-lncurses || return 1
+ make SHLIB_LIBS=-lncurses || Fdie
unset MAKEFLAGS
Fmakeinstall
Ffile /etc/inputrc
- chmod 755 $Fdestdir/usr/lib/libreadline.so.$pkgver \
- $Fdestdir/usr/lib/libhistory.so.$pkgver
+ Ffileschmod usr/lib/lib*.so.$pkgver 0755
}
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: bash-4.2_010-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5475432b9b4f85820f12a32e602b58b151caa382
commit 5475432b9b4f85820f12a32e602b58b151caa382
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 18:46:01 2011 +0100
bash-4.2_010-2-i686
* rebuild with readline.
diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild
index 7978a24..8fcc763 100644
--- a/source/base/bash/FrugalBuild
+++ b/source/base/bash/FrugalBuild
@@ -9,11 +9,11 @@ if [ -z $patchver ]; then
else
pkgver=${basever}_$patchver
fi
-pkgrel=1
+pkgrel=2
pkgdesc=The GNU Bourne Again shell
url=http://tiswww.case.edu/php/chet/bash/bashtop.html;
backup=(etc/{profile,shells,skel/.bashrc})
-depends=('glibc=2.8-3' 'readline=5.2-4')
+depends=('glibc=2.8-3' 'readline=6.2')
groups=('base' 'core')
archs=('i686' 'x86_64' 'ppc' 'arm')
up2date=echo \$(lynx -dump $url|grep current|sed -n -e 's/.*bash-\(.*\)\.
.*$/\1/' -e '1 p')\$(lynx -dump
ftp://ftp.cwru.edu/pub/bash/bash-$basever-patches|grep
'bash${basever//.}-[0-9]\{3\}'|sed -n
's/.*bash${basever//.}-\([0-9]\{3\}\).*/_\1/;$ p')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: beatbox-20111102-1-i686 * version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12fbf6b18d6f8b060ed143733cbdbc670cea26e5
commit 12fbf6b18d6f8b060ed143733cbdbc670cea26e5
Author: Devil505 devil505li...@gmail.com
Date: Wed Nov 2 19:20:59 2011 +0100
beatbox-2002-1-i686
* version bump
diff --git a/source/gnome-extra/beatbox/FrugalBuild
b/source/gnome-extra/beatbox/FrugalBuild
index f849643..b3452ac 100644
--- a/source/gnome-extra/beatbox/FrugalBuild
+++ b/source/gnome-extra/beatbox/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Pingax pin...@frugalware.fr
pkgname=beatbox
-pkgver=2001
+pkgver=2002
pkgrel=1
pkgdesc=Audio player written in vala
url=https://launchpad.net/beat-box/;
@@ -17,7 +17,7 @@ _F_gnome_iconcache=y
Finclude cmake gnome-scriptlet
up2date=Flasttar
http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname;
source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('cd30ef3302b399cf312843bdbe2363f921f89834')
+sha1sums=('9d511809cc485aed399d3167a184dbd7a27a8b93')
build() {
CMake_build
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: parted-3.0-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89f35634a12f4752100c2eae6cd2dc94c7404a0c
commit 89f35634a12f4752100c2eae6cd2dc94c7404a0c
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 18:56:05 2011 +0100
parted-3.0-2-i686
* Rebuild with readline.
diff --git a/source/base/parted/FrugalBuild b/source/base/parted/FrugalBuild
index 0c7435d..d035bf4 100644
--- a/source/base/parted/FrugalBuild
+++ b/source/base/parted/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=parted
pkgver=3.0
-pkgrel=1
+pkgrel=2
pkgdesc=A program for creating, destroying, resizing, checking and copying
partitions
url=http://www.gnu.org/software/parted/parted.html;
-depends=('e2fsprogs=1.41.14' 'readline=5.2-4')
+depends=('e2fsprogs=1.41.14' 'readline=6.2')
rodepends=('gawk=3.1.8' 'gzip=1.4' 'shadow=4.1.2.2-8' 'texinfo=4.11-4')
groups=('base')
archs=('i686' 'x86_64' 'ppc' 'arm')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libxml2-2.7.8-3-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d1f49b757bd7a0dc8fc44add15f2ff4efbc3f5a4
commit d1f49b757bd7a0dc8fc44add15f2ff4efbc3f5a4
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 19:05:31 2011 +0100
libxml2-2.7.8-3-i686
* Rebuild with readline.
diff --git a/source/base/libxml2/FrugalBuild b/source/base/libxml2/FrugalBuild
index 702a916..318a2d9 100644
--- a/source/base/libxml2/FrugalBuild
+++ b/source/base/libxml2/FrugalBuild
@@ -4,13 +4,13 @@
pkgname=libxml2
pkgver=2.7.8
-pkgrel=2
+pkgrel=3
pkgdesc=XML parsing library
url=http://www.xmlsoft.org/;
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc' 'arm')
depends=('zlib=1.2.3-6')
-makedepends=('python=2.7' 'readline=5.2-4')
+makedepends=('python=2.7' 'readline=6.2')
#up2date=lynx -dump 'ftp://xmlsoft.org/libxml2/'|grep -m1
'LATEST_LIBXML2_IS_'|sed 's/.*xml2-\(.*\).t.*/\1/'
up2date=Flasttar ftp://xmlsoft.org/libxml2/;
source=(ftp://xmlsoft.org/$pkgname/$pkgname-$pkgver.tar.gz versioning.diff)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdelibs-4.7.3-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=a459caece9ff88f502230bd42e5073cb3d1dee28
commit a459caece9ff88f502230bd42e5073cb3d1dee28
Author: Melko me...@frugalware.org
Date: Wed Nov 2 18:48:09 2011 +0100
kdelibs-4.7.3-1-i686
* version bump
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 6146110..2258fd7 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -1,4 +1,4 @@
-# Compiling Time: 25.85 SBU
+# Compiling Time: 25.80 SBU
# Maintainer: centuri0 achevaux at gmail dot com
USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-n}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: utouch-evemu-1.0.7-1-i686 * version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e036924f67d2c24edef3cb2dc12cf22df7b19534
commit e036924f67d2c24edef3cb2dc12cf22df7b19534
Author: Devil505 devil505li...@gmail.com
Date: Wed Nov 2 19:42:12 2011 +0100
utouch-evemu-1.0.7-1-i686
* version bump
diff --git a/source/lib-extra/utouch-evemu/FrugalBuild
b/source/lib-extra/utouch-evemu/FrugalBuild
index 3f987b0..733b128 100644
--- a/source/lib-extra/utouch-evemu/FrugalBuild
+++ b/source/lib-extra/utouch-evemu/FrugalBuild
@@ -2,15 +2,14 @@
# Maintainer: Devil505 devil505li...@gmail.com
pkgname=utouch-evemu
-pkgver=1.0.6
+pkgver=1.0.7
pkgrel=1
pkgdesc=Event Emulation for the uTouch Stack
-url=http://launchpad.net/utouch-evemu;
depends=('glibc')
groups=('lib-extra')
archs=('i686' 'x86_64')
-up2date=Flasttar $url
-source=($url/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz)
-sha1sums=('441d4fab1ef74814317ec518a4aa9076cc9502ea')
+_F_launchpad_subdir=$pkgname-$pkgver
+Finclude launchpad
+sha1sums=('15c9cc4b468ad6b7e98f32417599b44870c7f289')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: ntp-4.2.6p4-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9cd4a30f31b63aa7da531096b175ff8d96dc
commit 9cd4a30f31b63aa7da531096b175ff8d96dc
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 20:27:44 2011 +0100
ntp-4.2.6p4-2-i686
* Rebuild with libedit instead of readline (expected by the configure
script).
* Migrate to systemd service.
diff --git a/source/network-extra/ntp/FrugalBuild
b/source/network-extra/ntp/FrugalBuild
index 3fb6afa..3a87a42 100644
--- a/source/network-extra/ntp/FrugalBuild
+++ b/source/network-extra/ntp/FrugalBuild
@@ -1,34 +1,33 @@
# Compiling Time: 0.85 SBU
-# Maintainer: CSÉCSY László boo...@frugalware.org
+# Maintainer: CSÉCSY László boo...@frugalware.org
# Contributor: Krisztian VASAS i...@frugalware.org
pkgname=ntp
pkgver=4.2.6p4
-pkgrel=1
+pkgrel=2
pkgdesc=The ntp daemon from ntp.org
url=http://www.ntp.org/;
conflicts=('openntpd')
groups=('network-extra')
archs=('i686' 'x86_64' 'arm')
-depends=('openssl=1.0.0' 'readline')
+depends=('openssl=1.0.0' 'libedit')
up2date=lynx -dump http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ | grep -m1
'http.*tar.gz$' | sed 's/.*ntp-\(.*\)\.tar.*/\1/'
source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$pkgname-$pkgver.tar.gz \
ntp-4.2.6p1-nano.patch \
- rc.ntpd rc.ntpd.pot ntp.org.conf)
+ ntpd.service \
+ ntp.org.conf)
backup=(etc/ntp.org.conf)
sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' \
'21ecca90c622951fcb8469ee5822416bb6bf6a68' \
- '2bf638fba95847568e45afc7b2cfdf6d1767b429' \
- '6f0275b9c1adcdef0c441408d8b5c4e4c82e1de4' \
+ 'e38e44b2e9e418f89417ac140991c02b8cf1e353' \
'9e116eabff29a0216bfc2c56817ba48d1f3182f6')
-
# TODO: add some sort init script
build()
{
Fbuild
- Fmkdir etc/rc.d
Ffile ntp.org.conf /etc
- Fexe rc.ntpd /etc/rc.d
+ Fmkdir lib/systemd/system/
+ Finstall 0644 ntpd.service /lib/systemd/system/ntpd.service
}
# optimization OK
diff --git a/source/network-extra/ntp/ntp-4.2.0-gcc4.diff
b/source/network-extra/ntp/ntp-4.2.0-gcc4.diff
deleted file mode 100644
index b2be506..000
--- a/source/network-extra/ntp/ntp-4.2.0-gcc4.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur ntp-4.2.0.orig/include/ntp_control.h ntp-4.2.0/include/ntp_control.h
ntp-4.2.0.orig/include/ntp_control.h 2003-08-14 09:31:47.0
+0200
-+++ ntp-4.2.0/include/ntp_control.h2006-01-30 16:14:44.0 +0100
-@@ -266,6 +266,7 @@
- u_char tr_flags;/* trap flags */
- u_char tr_version; /* version number of trapper */
- };
-+extern struct ctl_trap ctl_trap[];
-
- /*
- * Flag bits
-diff -Naur ntp-4.2.0.orig/include/ntpd.h ntp-4.2.0/include/ntpd.h
ntp-4.2.0.orig/include/ntpd.h 2003-09-13 05:08:04.0 +0200
-+++ ntp-4.2.0/include/ntpd.h 2006-01-30 16:14:44.0 +0100
-@@ -226,8 +226,6 @@
- #endif
-
- /* ntp_control.c */
--struct ctl_trap;
--extern struct ctl_trap ctl_trap[];
- extern intnum_ctl_traps;
- extern keyid_tctl_auth_keyid; /* keyid used for
authenticating write requests */
-
-diff -Naur ntp-4.2.0.orig/include/ntp_refclock.h
ntp-4.2.0/include/ntp_refclock.h
ntp-4.2.0.orig/include/ntp_refclock.h 2003-07-17 12:27:16.0
+0200
-+++ ntp-4.2.0/include/ntp_refclock.h 2006-01-30 16:14:44.0 +0100
-@@ -65,6 +65,7 @@
- const char *clocktype; /* long description */
- const char *abbrev; /* short description */
- };
-+extern struct clktype clktypes[];
-
- /*
- * Configuration flag values
-diff -Naur ntp-4.2.0.orig/include/ntp_stdlib.h ntp-4.2.0/include/ntp_stdlib.h
ntp-4.2.0.orig/include/ntp_stdlib.h2003-07-17 12:27:16.0
+0200
-+++ ntp-4.2.0/include/ntp_stdlib.h 2006-01-30 16:14:44.0 +0100
-@@ -133,10 +133,6 @@
- extern u_char * cache_key; /* key pointer */
- extern u_int cache_keylen; /* key length */
-
--/* clocktypes.c */
--struct clktype;
--extern struct clktype clktypes[];
--
- /* getopt.c */
- extern char * ntp_optarg; /* global argument pointer */
- extern intntp_optind; /* global argv index */
diff --git a/source/network-extra/ntp/ntpd.service
b/source/network-extra/ntp/ntpd.service
new file mode 100644
index 000..0df9402
--- /dev/null
+++ b/source/network-extra/ntp/ntpd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Network Time Service
+
+[Service]
+ExecStart=/usr/bin/ntpd -g -c /etc/ntp.org.conf
+
+[Install]
+WantedBy=time-sync.target
\ No newline at end of file
diff --git a/source/network-extra/ntp/rc.ntpd b/source/network-extra/ntp/rc.ntpd
deleted file mode 100644
index ea82a93..000
--- a/source/network-extra/ntp/rc.ntpd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl bmh198...@yahoo.de
-# (c) 2004 Peter BARABAS z...@artifact.hu
-# (c) 2007 CSÉCSY László boo...@frugalware.org
-# rc.ntpd for Frugalware
-# distributed under GPL License
-
-#
[Frugalware-git] frugalware-current: bc-1.06-10-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2d47ae53e8884f25818a7203cba64c6470c5e17
commit b2d47ae53e8884f25818a7203cba64c6470c5e17
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 20:33:43 2011 +0100
bc-1.06-10-i686
* Rebuild with readline.
diff --git a/source/apps/bc/FrugalBuild b/source/apps/bc/FrugalBuild
index c243abf..01be458 100644
--- a/source/apps/bc/FrugalBuild
+++ b/source/apps/bc/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=bc
pkgver=1.06
-pkgrel=9
+pkgrel=10
pkgdesc=An arbitrary precision calculator language
url=http://www.gnu.org/software/bc/;
-depends=('readline')
+depends=('readline=6.2')
groups=('apps' 'chroot-core')
archs=('i686' 'x86_64' 'ppc' 'arm')
Fup2gnugz
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdepimlibs-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=e3d4833bce8264097e217419f5c279a08afd8d29 commit e3d4833bce8264097e217419f5c279a08afd8d29 Author: Melko me...@frugalware.org Date: Wed Nov 2 20:33:25 2011 +0100 kdepimlibs-4.7.3-1-i686 * version bump diff --git a/source/kde/kdepimlibs/FrugalBuild b/source/kde/kdepimlibs/FrugalBuild index ff9264d..0bbd385 100644 --- a/source/kde/kdepimlibs/FrugalBuild +++ b/source/kde/kdepimlibs/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 2.72 SBU +# Compiling Time: 4.73 SBU # Maintainer: centuriO achev...@gmail.com pkgname=kdepimlibs ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gawk-4.0.0-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42e2e5c2449e702f7e2b5026b480430b8e69983d
commit 42e2e5c2449e702f7e2b5026b480430b8e69983d
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 20:41:57 2011 +0100
gawk-4.0.0-2-i686
* Rebuild with readline.
diff --git a/source/base/gawk/FrugalBuild b/source/base/gawk/FrugalBuild
index 5451885..fc6594d 100644
--- a/source/base/gawk/FrugalBuild
+++ b/source/base/gawk/FrugalBuild
@@ -3,13 +3,13 @@
pkgname=gawk
pkgver=4.0.0
-pkgrel=1
+pkgrel=2
pkgdesc=Gnu version of awk
url=http://www.gnu.org/software/gawk/;
-depends=('glibc=2.8-3')
+depends=('readline=4.6')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc' 'arm')
-up2date=lynx -dump http://ftp.gnu.org/gnu/gawk/|grep --
'gawk-[0-9.]\+'|Flasttar
+up2date=Flasttar http://ftp.gnu.org/gnu/$pkgname/;
source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
sha1sums=('dbf6601a2899669f59ea28dfad36144c5c3d2bbc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mysql-5.5.17-2-x86_64 *fix depends *move libmysqld to extra
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14480b4128bb76935ff2ad11f6f4143f1519592a
commit 14480b4128bb76935ff2ad11f6f4143f1519592a
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 20:56:11 2011 +0100
mysql-5.5.17-2-x86_64
*fix depends
*move libmysqld to extra
diff --git a/source/apps-extra/mysql/FrugalBuild
b/source/apps-extra/mysql/FrugalBuild
index 652c467..a7b8ae3 100644
--- a/source/apps-extra/mysql/FrugalBuild
+++ b/source/apps-extra/mysql/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=mysql
pkgver=5.5.17
-pkgrel=1
+pkgrel=2
extrapkgver=
pkgdesc=A fast SQL database server
url=http://www.mysql.com/;
@@ -24,8 +24,8 @@ signatures=($source.asc '' '' '' '')
subpkgs=('libmysqlclient' 'libmysqld')
subdescs=('MySQL client library.' 'Embedded MySQL Server Library')
-subdepends=('openssl=1.0.0 zlib' 'libstdc++ openssl=1.0.0 zlib')
-subgroups=('lib' 'lib')
+subdepends=('openssl=1.0.0 zlib' 'libstdc++ openssl=1.0.0 zlib libaio')
+subgroups=('lib' 'lib-extra')
subarchs=('i686 x86_64 ppc arm' 'i686 x86_64 ppc arm')
build()
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: authors.xml *added baste co mainteneur gnome
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af667773a0513690681d77395bfb87dfcfb4d4bd commit af667773a0513690681d77395bfb87dfcfb4d4bd Author: bouleetbil bouleet...@frogdev.info Date: Wed Nov 2 21:01:50 2011 +0100 authors.xml *added baste co mainteneur gnome diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml index 8e461ad..94b83dd 100644 --- a/docs/xml/authors.xml +++ b/docs/xml/authors.xml @@ -23,6 +23,7 @@ the list will be sorted automatically, so you no longer need to care about the o nickBaste/nick emailba...@frugalware.org/email rolePackage maintainer/role + roleco-mainteneur gnome/role statusactive/status /author author ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdebase-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=9e7d7ce48a1ef67954ef6993a2463f6c9a55d100 commit 9e7d7ce48a1ef67954ef6993a2463f6c9a55d100 Author: Melko me...@frugalware.org Date: Wed Nov 2 21:22:14 2011 +0100 kdebase-4.7.3-1-i686 * version bump diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild index 4d12365..0461343 100644 --- a/source/kde/kdebase/FrugalBuild +++ b/source/kde/kdebase/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 7.17 SBU +# Compiling Time: 7.15 SBU # Maintainer: centuri0 achevaux at gmail dot com pkgname=kdebase ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gparted-0.10.0-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eaaef9605b5331836dbbc50c77e8eb8731b5967d
commit eaaef9605b5331836dbbc50c77e8eb8731b5967d
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 21:31:47 2011 +0100
gparted-0.10.0-1-x86_64
*Version bump
diff --git a/source/xapps-extra/gparted/FrugalBuild
b/source/xapps-extra/gparted/FrugalBuild
index 45862d5..700870c 100644
--- a/source/xapps-extra/gparted/FrugalBuild
+++ b/source/xapps-extra/gparted/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=gparted
-pkgver=0.9.1
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
pkgdesc=Parted GUI written in C++ using gtkmm as Graphical Toolkit
depends=('parted=3.0' 'gtkmm2' 'freetype2' 'pango=1.28.0-2' 'hal')
makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool')
@@ -14,7 +14,7 @@ _F_sourceforge_ext=.tar.bz2
Finclude sourceforge
url=http://gparted.sourceforge.net;
source=($source gparted-kde.desktop)
-sha1sums=('01dfcd02cefd9bf82ede6d6c9637793d7b64edd0' \
+sha1sums=('79550065ef0c131abc8763eaf4c9b8842768a75a' \
'9fef48cb9b11c71c79a5b4ce8bf1296920a095c2')
subpkgs=($pkgname-minimal)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: banshee-2.2.1-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ce6bb49502a54fdd9fcef919b4f0e0a33dca425
commit 9ce6bb49502a54fdd9fcef919b4f0e0a33dca425
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 21:37:50 2011 +0100
banshee-2.2.1-1-x86_64
*Version bump
diff --git a/source/gnome-extra/banshee/FrugalBuild
b/source/gnome-extra/banshee/FrugalBuild
index 169cdae..5b69c1a 100644
--- a/source/gnome-extra/banshee/FrugalBuild
+++ b/source/gnome-extra/banshee/FrugalBuild
@@ -5,8 +5,8 @@
USE_DEVEL=${USE_DEVEL:-n}
pkgname=banshee
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
pkgdesc=Banshee is a Mono based media player for Gnome
url=http://banshee-project.org;
depends=('libxml2=2.7.8' 'gnome-sharp=2.24.2' 'ipod-sharp=0.8.5'
'libgpod-sharp' 'sqlite3' 'hal' 'libmusicbrainz' 'brasero' \
@@ -28,7 +28,7 @@ Finclude mono gnome-scriptlet gnome
Fconfopts=$Fconfopts --enable-docs --enable-avahi --enable-ipod \
--enable-karma --enable-mtp --enable-external-ndesk-dbus \
--enable-njb --disable-debug --with-vendor-build-id=Frugalware
-sha1sums=('def16921ae5339e56e8fcfb2616a7f0ec13ab611')
+sha1sums=('570df8c12782d196a423f2d2fa7eefa1fdbe297d')
build() {
unset MAKEFLAGS
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gutenprint-5.2.7-3-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d783b37e455dd7b03e975fea46bdefd3bda1462
commit 3d783b37e455dd7b03e975fea46bdefd3bda1462
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 21:49:07 2011 +0100
gutenprint-5.2.7-3-i686
* Rebuild with readline.
diff --git a/source/apps-extra/gutenprint/FrugalBuild
b/source/apps-extra/gutenprint/FrugalBuild
index 6dfdec9..c36d2f5 100644
--- a/source/apps-extra/gutenprint/FrugalBuild
+++ b/source/apps-extra/gutenprint/FrugalBuild
@@ -4,9 +4,9 @@
pkgname=gutenprint
pkgver=5.2.7
-pkgrel=2
+pkgrel=3
pkgdesc=IJS printer driver for Ghostscript and CUPS
-depends=('libxml2=2.7.8' 'cups=1.1.15' 'readline' 'openssl=1.0.0-2')
+depends=('libxml2=2.7.8' 'cups=1.1.15' 'readline=6.2' 'openssl=1.0.0-2')
makedepends=('gimp=2.6.11-2')
rodepends=('foomatic-filters=2.0')
groups=('apps-extra')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnome-tweak-tool-3.2.1-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0d1f0514b45baf6195bbc363f1dfe19ef34c20f
commit a0d1f0514b45baf6195bbc363f1dfe19ef34c20f
Author: bouleetbil bouleet...@frogdev.info
Date: Wed Nov 2 21:41:23 2011 +0100
gnome-tweak-tool-3.2.1-1-x86_64
*Version bump
diff --git a/source/gnome/gnome-tweak-tool/FrugalBuild
b/source/gnome/gnome-tweak-tool/FrugalBuild
index 4666469..a7d5a88 100644
--- a/source/gnome/gnome-tweak-tool/FrugalBuild
+++ b/source/gnome/gnome-tweak-tool/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=gnome-tweak-tool
-pkgver=3.2.0
+pkgver=3.2.1
pkgrel=1
pkgdesc=A tool to customize advanced GNOME 3 options.
depends=('gnome-shell' 'pygobject')
@@ -11,5 +11,5 @@ groups=('gnome')
archs=('i686' 'x86_64')
_F_gnome_desktop=y
Finclude gnome gnome-scriptlet
-sha1sums=('ae8d5ea3e7ef0e2baa60f73153462f2ed10141c4')
+sha1sums=('d23d76405b9a30709aa248eff677197fdd309a28')
replaces=('gnomeartng')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnupg-1.4.11-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a93a7d1ad8819f4034ef5fb6a55e4bbd658deba
commit 0a93a7d1ad8819f4034ef5fb6a55e4bbd658deba
Author: Michel Hermier herm...@frugalware.org
Date: Wed Nov 2 22:04:51 2011 +0100
gnupg-1.4.11-2-i686
* Rebuild with readline.
diff --git a/source/apps/gnupg/FrugalBuild b/source/apps/gnupg/FrugalBuild
index de41fbd..32c21d0 100644
--- a/source/apps/gnupg/FrugalBuild
+++ b/source/apps/gnupg/FrugalBuild
@@ -6,12 +6,13 @@ pkgver=1.4.11
pkgrel=1
pkgdesc=GnuPG is a complete and free replacement for PGP
url=http://www.gnupg.org/;
-depends=('zlib=1.2.3-6' 'bzip2=1.0.5-2' 'readline=5.2-4')
+depends=('zlib=1.2.3-6' 'bzip2=1.0.5-2' 'readline=6.2')
groups=('apps' 'chroot-core')
archs=('i686' 'x86_64' 'ppc' 'arm')
# yes, this is intentional, voroskoi will bump this pkg to 2.x when he says 2.x
# is stable enough
-up2date=lynx -dump http://www.gnupg.org/download/index.en.html |grep -v 2.0
|Flasttar
+_F_archive_grepv=2.0
+up2date=Flasttar http://www.gnupg.org/download/index.en.html;
source=(ftp://ftp.gnupg.org/GnuPG/gnupg/$pkgname-$pkgver.tar.gz)
signatures=($source.sig)
Finclude texinfo
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdebase-runtime-4.7.3-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=3c2165d2fb2c94669faacc9d7c6008c1a4558d6b
commit 3c2165d2fb2c94669faacc9d7c6008c1a4558d6b
Author: Melko me...@frugalware.org
Date: Wed Nov 2 22:41:35 2011 +0100
kdebase-runtime-4.7.3-1-i686
* version bump
diff --git a/source/kde/kdebase-runtime/FrugalBuild
b/source/kde/kdebase-runtime/FrugalBuild
index 365c65a..a58216a 100644
--- a/source/kde/kdebase-runtime/FrugalBuild
+++ b/source/kde/kdebase-runtime/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: centuri0 achevaux at gmail dot com
pkgname=kdebase-runtime
-pkgrel=3
+pkgrel=1
pkgdesc=Programs and libraries needed at runtime by other KDE4 applications
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -50,7 +50,7 @@ subreplaces=(${subreplaces[@]} )
subgroups=(${subgroups[@]} kde kde-core kde-runtime)
subarchs=(${subarchs[@]} i686 x86_64 ppc)
-makedepends=(${makedepends[@]} phonon-backend-gstreamer
phonon-backend-vlc phonon-backend-xine pulseaudio=1.1)
+makedepends=(${makedepends[@]} phonon-backend-gstreamer
phonon-backend-vlc pulseaudio=1.1)
subpkgs=(${subpkgs[@]} $pkgname-kcontrol)
subdescs=(${subdescs[@]} Runtime Files for Kcontrol.)
subdepends=(${subdepends[@]} strigi=0.7.2 libqtnetwork=$Qt4 libqtxml=$Qt4
xfsprogs-acl libqtsvg=$Qt4 libsm libxtst libxcursor
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdebase-workspace-4.7.3-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=f40ebd03e14cb290b6056904f04b6084999399b6
commit f40ebd03e14cb290b6056904f04b6084999399b6
Author: Melko me...@frugalware.org
Date: Wed Nov 2 23:43:58 2011 +0100
kdebase-workspace-4.7.3-1-i686
* version bump
diff --git a/source/kde/kdebase-workspace/FrugalBuild
b/source/kde/kdebase-workspace/FrugalBuild
index 7f335fa..7a69e9a 100644
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@ -1,4 +1,4 @@
-# Compiling Time: 7.95 SBU
+# Compiling Time: 7.96 SBU
# Maintainer: centuri0 achevaux at gmail dot com
USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-n}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: Move dracut-based core out of its subdir
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=6b2396b039b06d9e82b208d16a4306e2b156bbfb commit 6b2396b039b06d9e82b208d16a4306e2b156bbfb Author: Miklos Vajna vmik...@frugalware.org Date: Wed Nov 2 23:43:25 2011 +0100 Move dracut-based core out of its subdir diff --git a/dracut/01create-rootfs.sh b/01create-rootfs.sh similarity index 100% rename from dracut/01create-rootfs.sh rename to 01create-rootfs.sh diff --git a/dracut/02create-squash.sh b/02create-squash.sh similarity index 100% rename from dracut/02create-squash.sh rename to 02create-squash.sh diff --git a/dracut/03create-iso.sh b/03create-iso.sh similarity index 100% rename from dracut/03create-iso.sh rename to 03create-iso.sh diff --git a/dracut/04boot-qemu.sh b/04boot-qemu.sh similarity index 100% rename from dracut/04boot-qemu.sh rename to 04boot-qemu.sh diff --git a/README b/README index 4ad8e69..93152ba 100644 --- a/README +++ b/README @@ -7,14 +7,10 @@ To build the livecd: $ sudo make -To clean up compiled code in the source dir: +To clean up: $ sudo make clean -To remove the building chroot: - - $ sudo make distclean - From scratch diff --git a/dracut/config b/config similarity index 100% rename from dracut/config rename to config ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: 04boot-qemu.sh: use config
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=2f7c0e5976b8f30def2c9d9643a081116a3a0b6d commit 2f7c0e5976b8f30def2c9d9643a081116a3a0b6d Author: Miklos Vajna vmik...@frugalware.org Date: Wed Nov 2 23:55:23 2011 +0100 04boot-qemu.sh: use config diff --git a/04boot-qemu.sh b/04boot-qemu.sh index fdca286..3d0e70a 100755 --- a/04boot-qemu.sh +++ b/04boot-qemu.sh @@ -1,2 +1,4 @@ -qemu-system-x86_64 -enable-kvm -m 512 -kernel rootfs/boot/vmlinuz -initrd rootfs/boot/initrd.img.xz \ - -append root=live:CDLABEL=fwlive rd.driver.pre=loop rd.plymouth=0 -cdrom fwlive.iso +source ./config + +qemu-system-x86_64 -enable-kvm -m 512 -kernel $CHROOTDIR/boot/vmlinuz -initrd $CHROOTDIR/boot/initrd.img.xz \ + -append root=live:CDLABEL=fwlive rd.driver.pre=loop rd.plymouth=0 -cdrom fwlive-$TREE.iso ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: no need to duplicate kernel params here
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=b205dff4bd8f969b0b164a35354d25053725b628 commit b205dff4bd8f969b0b164a35354d25053725b628 Author: Miklos Vajna vmik...@frugalware.org Date: Wed Nov 2 23:57:11 2011 +0100 no need to duplicate kernel params here diff --git a/04boot-qemu.sh b/04boot-qemu.sh index 3d0e70a..877b261 100755 --- a/04boot-qemu.sh +++ b/04boot-qemu.sh @@ -1,4 +1,3 @@ source ./config -qemu-system-x86_64 -enable-kvm -m 512 -kernel $CHROOTDIR/boot/vmlinuz -initrd $CHROOTDIR/boot/initrd.img.xz \ - -append root=live:CDLABEL=fwlive rd.driver.pre=loop rd.plymouth=0 -cdrom fwlive-$TREE.iso +qemu-system-x86_64 -enable-kvm -m 512 -cdrom fwlive-$TREE.iso ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: konsole-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=1fd64f51ebdcefd25a6c82c755237cad955737c5 commit 1fd64f51ebdcefd25a6c82c755237cad955737c5 Author: Melko me...@frugalware.org Date: Wed Nov 2 23:58:37 2011 +0100 konsole-4.7.3-1-i686 * version bump diff --git a/source/kde/konsole/FrugalBuild b/source/kde/konsole/FrugalBuild index 744c989..ba7084c 100644 --- a/source/kde/konsole/FrugalBuild +++ b/source/kde/konsole/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.26 SBU +# Compiling Time: 0.25 SBU # Maintainer: centuri0 achevaux at gmail dot com pkgname=konsole ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: 01create-rootfs.sh: more error checking
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=fc019ab6a7af4a114bb01901f0f3bd28326ab9ab
commit fc019ab6a7af4a114bb01901f0f3bd28326ab9ab
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 3 00:04:16 2011 +0100
01create-rootfs.sh: more error checking
diff --git a/01create-rootfs.sh b/01create-rootfs.sh
index 09193d9..67dc08f 100755
--- a/01create-rootfs.sh
+++ b/01create-rootfs.sh
@@ -1,55 +1,41 @@
-#!/bin/bash
+#!/bin/bash -xe
. /etc/makepkg.conf
. $PWD/config
-chroot_umount() {
- echo Attempting to umount chroot directories...
- umount $CHROOTDIR/proc /dev/null
- umount $CHROOTDIR/sys /dev/null
- umount $CHROOTDIR/var/cache/pacman-g2 /dev/null
- if [ $? != 0 ]; then
- echo An error occurred while attempting to umount chroot
directories.
- exit 1
- fi
- echo Successfully umounted chroot directories.
-}
-
-chroot_mount() {
- echo Attempting to mount chroot directories...
- mount -t proc none $CHROOTDIR/proc /dev/null
- mount -t sysfs none $CHROOTDIR/sys /dev/null
- mount -o bind /var/cache/pacman-g2 $CHROOTDIR/var/cache/pacman-g2
/dev/null
- if [ $? != 0 ]; then
- echo An error occurred while attempting to mount chroot
directories.
- exit 1
- fi
- echo Successfully mounted chroot directories.
-}
-
-# Create the chroot environment.
if [ `id -u` != 0 ]; then
echo Building the chroot as an unprivileged user is not possible.
exit 1
fi
+# Create empty dir
rm -rf $CHROOTDIR
mkdir -p $CHROOTDIR/{etc,proc,sys,var/cache/pacman-g2,var/tmp/fst,tmp,var/log}
-chroot_mount
+# Mount chroot
+echo Attempting to mount chroot directories...
+mount -t proc none $CHROOTDIR/proc /dev/null
+mount -t sysfs none $CHROOTDIR/sys /dev/null
+mount -o bind /var/cache/pacman-g2 $CHROOTDIR/var/cache/pacman-g2 /dev/null
+echo Successfully mounted chroot directories.
+# Build it
echo Building chroot environment
-
-[ -e pacman-g2.conf ] rm -f pacman-g2.conf;
-[ $TREE == current ] echo [frugalware-current] pacman-g2.conf
-[ $TREE == stable ] echo [frugalware] pacman-g2.conf
+if [ -e pacman-g2.conf ]; then
+ rm -f pacman-g2.conf
+fi
+if [ $TREE == current ]; then
+ echo [frugalware-current] pacman-g2.conf
+fi
+if [ $TREE == stable ]; then
+ echo [frugalware] pacman-g2.conf
+fi
echo Server =
http://ftp.frugalware.org/pub/frugalware/frugalware-$TREE/frugalware-$ARCH;
pacman-g2.conf
-
pacman -Sy base -r $CHROOTDIR --noconfirm --config pacman-g2.conf
-if [ $? != 0 ]; then
- echo Failed to build chroot environment.
- chroot_umount
- exit 1
-fi
-chroot_umount
+# Umount
+echo Attempting to umount chroot directories...
+umount $CHROOTDIR/proc /dev/null
+umount $CHROOTDIR/sys /dev/null
+umount $CHROOTDIR/var/cache/pacman-g2 /dev/null
+echo Successfully umounted chroot directories.
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: kdebase-workspace-wallpapers-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=bf220bf29d801b120a5eaee910a47957fc1f2281 commit bf220bf29d801b120a5eaee910a47957fc1f2281 Author: Melko me...@frugalware.org Date: Thu Nov 3 00:24:57 2011 +0100 kdebase-workspace-wallpapers-4.7.3-1-i686 * version bump diff --git a/source/kde-extra/kdebase-workspace-wallpapers/FrugalBuild b/source/kde-extra/kdebase-workspace-wallpapers/FrugalBuild index 19f5f89..8a2458a 100644 --- a/source/kde-extra/kdebase-workspace-wallpapers/FrugalBuild +++ b/source/kde-extra/kdebase-workspace-wallpapers/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.02 SBU # Maintainer: centuri0 achevaux at gmail dot com pkgname=kdebase-workspace-wallpapers ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: Drop no longer neccessary prefix, these are now invoked from the Makefile
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=aaeb4951f0cc4477652e6e403be1b7f1ecfd5799
commit aaeb4951f0cc4477652e6e403be1b7f1ecfd5799
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 3 00:16:51 2011 +0100
Drop no longer neccessary prefix, these are now invoked from the Makefile
diff --git a/Makefile b/Makefile
index 458364d..b23fb81 100644
--- a/Makefile
+++ b/Makefile
@@ -2,319 +2,26 @@
# Makefile for livecd creation
#
-ARCH = $(shell uname -m)
--include config
-CHROOTDIR = $(shell source /etc/makepkg.conf; echo $$CHROOTDIR)/fwlive
-PACCONF := $(shell mktemp)
-FWLSLANG = $(shell echo $(FWLLLANG)|sed 's/_.*//')
-KERNVER = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q kernel|cut -d ' ' -f2|sed
's/-/-fw/'
-GLIBCVER = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q glibc|sed 's/.* \(.*\)-.*/\1/'
-FWLREL = pacman-g2 -r ${CHROOTDIR}/${TREE} -Q frugalware |sed 's/.*
\(.*\)-.*/\1/'
-ifeq ($(CONFIG_SETUP),y)
-SETUPDIR = ${CHROOTDIR}/${TREE}/usr/share/setup
-SETUPKERNELVER = cd $(SETUPDIR); ls vmlinuz*|sed 's/vmlinuz-//'
-SETUPKERNEL = $(SETUPDIR)/vmlinuz-$(shell ${SETUPKERNELVER})
-SETUPINITRD = $(SETUPDIR)/initrd-$(ARCH).img.gz
-SETUPINITRDSIZE = echo $$(($$(gzip --list $(SETUPINITRD) |grep
initrd-$(ARCH).img|sed 's/.*[0-9]\+ \+\([0-9]\+\) .*/\1/')/1024))
-endif
-# needed files (files that we can't live without)
-NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in rc.fsupd \
- crypt.c rc.fwlive rc.config configsave fileswap reboot.diff
services.diff \
- rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst fwliverc
-INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd
/usr/local/bin/configsave \
- /usr/local/bin/fileswap /usr/local/bin/fstab-update
/usr/local/bin/xstart /usr/local/bin/fwliverc \
- /usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline
/tmp/live-base/tools/fpm2lzm
-INST_FILES_644 = /etc/X11/xorg.conf /boot/grub/menu.lst
-PWD = $(shell pwd)
-PATCH_FILES = reboot.diff services.diff
-REMOVE_FILES = /etc/rc.d/rcS.d/S{19rc.bootclean,07rc.frugalware} \
-
/etc/rc.d/rc{3.d,4.d}/S{21rc.firewall,26rc.lmsensors,32rc.sshd,78rc.mysqld,80rc.postfix,81rc.courier-authlib,82rc.imapd,82rc.pop3d,85rc.httpd,95rc.crond,99rc.cups,99rc.mono,99cups,12rc.syslog,13rc.portmap,19rc.rmount,50rc.atd}
\
-
/etc/rc.d/rc0.d/K{00cups,01rc.cups,05rc.crond,60rc.atd,87rc.portmap,88rc.syslog,90rc.rmount,96rc.swap,98rc.interfaces,56rc.sshd,30rc.postfix}
\
-
/etc/rc.d/rc6.d/K{01rc.cups,05rc.crond,60rc.atd,87rc.portmap,88rc.syslog,90rc.rmount,96rc.swap,98rc.interfaces,56rc.sshd,30rc.postfix}
\
- /etc/frugalware-release
-CC = cc
-
-all: checkroot check-tree checkfiles chroot-mkdirs create-pkgdb cache-mount
install-base install-kernel install-apps cache-umount install-files patch-files
remove-files create-symlinks create-files fix-files create-users live-base
hacking-kdmrc kill-packages create
- @echo Finally, we do nothing more by now.
+all: create-iso
@echo Now burn your iso and have fun!
-check-tree:
- if [ -e /etc/repoman.conf ]; then \
- source /etc/repoman.conf; \
- grep -v Include /etc/pacman-g2.conf ${PACCONF}; \
- else \
- @echo Error: Cannot find repoman.conf , is pacman-tools
installed ?; \
- exit 1; \
- fi
-
- for i in `echo ${TREE}|sed 's/,/ /g'`; do \
- repo=$$(eval echo \$${$${i}_fdb/.fdb}); \
- [ -z $$repo ] repo=$$i; \
- [ ${TREE} == testing ] echo [frugalware-current]
${PACCONF}; \
- [ ${TREE} == current ] echo [frugalware-current]
${PACCONF}; \
- [ ${TREE} == stable ] echo [frugalware] ${PACCONF}; \
- echo Server =
http://ftp.frugalware.org/pub/frugalware/frugalware-$$repo/frugalware-i686;
${PACCONF}; \
- done
-
-parse_cmdline: parse_cmdline.in
- sed 's/@FWLLLANG@/$(FWLLLANG)/' $@.in $@
-
-xorg.conf: xorg.conf.in
- sed 's/@FWLSLANG@/$(FWLSLANG)/' $@.in $@
- sed -i 's/en/us/' $@
-
-checkfiles: parse_cmdline xorg.conf
- ${MAKE} -C po pos
- for i in ${NEED_FILES}; do \
- if [ ! -f $$i ] ; then \
- echo Missing file: $$i; \
- exit 2; \
- fi; \
- done
-
-checkroot:
- if (( $$(id -u) 0 )) ; then \
- echo Only root can execute this script! (Or at least with this
target...); \
- exit 3; \
- fi
-
-chroot-mkdirs: checkroot
- mkdir -p
${CHROOTDIR}/${TREE}/{dev,etc,proc,sys,var/cache/pacman-g2,var/log}
-
-create-pkgdb: checkroot
- pacman-g2 -r ${CHROOTDIR}/${TREE} -Syuf --noconfirm --config ${PACCONF}
-
-# pacman should really have a --dont-reinstall switch
-install-base: checkroot
- if [ ! -d ${CHROOTDIR}/${TREE}/usr ] ; then \
- pacman-g2 -r ${CHROOTDIR}/${TREE} -Sf base --noconfirm --config
${PACCONF} ; \
- fi
-
[Frugalware-git] kdebump: kate-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=1c53c8b86a7f0be0c83bf8da80197ac4f2dd323f commit 1c53c8b86a7f0be0c83bf8da80197ac4f2dd323f Author: Melko me...@frugalware.org Date: Thu Nov 3 00:47:49 2011 +0100 kate-4.7.3-1-i686 * version bump diff --git a/source/kde-extra/kate/FrugalBuild b/source/kde-extra/kate/FrugalBuild index 85c84ab..6f7e6c8 100644 --- a/source/kde-extra/kate/FrugalBuild +++ b/source/kde-extra/kate/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 1.55 SBU +# Compiling Time: 1.54 SBU # Maintainer: centuri0 achevaux at gmail dot com pkgname=kate ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdebump: svgpart-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=424b9430fea1b6fe0b80d5cbf0e9a5ae2f9bd078 commit 424b9430fea1b6fe0b80d5cbf0e9a5ae2f9bd078 Author: Melko me...@frugalware.org Date: Thu Nov 3 01:09:38 2011 +0100 svgpart-4.7.3-1-i686 * version bump diff --git a/source/kde-extra/svgpart/FrugalBuild b/source/kde-extra/svgpart/FrugalBuild index edb53b4..e09e6a4 100644 --- a/source/kde-extra/svgpart/FrugalBuild +++ b/source/kde-extra/svgpart/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.37 SBU +# Compiling Time: 0.35 SBU # Maintainer: centuri0 achevaux at gmail dot com #remove after 1.6 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: speed up generation of the rootfs image by installing packages directly to the loopback device
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d5547bd2a233011985dacad577ff7258e9bed528
commit d5547bd2a233011985dacad577ff7258e9bed528
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 3 01:14:36 2011 +0100
speed up generation of the rootfs image by installing packages directly to the
loopback device
diff --git a/create-iso.sh b/create-iso.sh
index a5817b2..194f76d 100755
--- a/create-iso.sh
+++ b/create-iso.sh
@@ -6,10 +6,13 @@ rm -rf $TREE/iso
#Create Iso with grub
#TODO: add fwlive gfx
mkdir -p $TREE/iso/boot/grub
+mkdir -p $TREE/rootfs
+mount $TREE/squashfs-root/LiveOS/rootfs.img -o loop $TREE/rootfs
cp -v $TREE/rootfs/boot/grub/message $TREE/iso/boot/grub/
cp -v $TREE/rootfs/boot/vmlinuz $TREE/iso/boot/
cp -v $TREE/rootfs/boot/initrd.img.xz $TREE/iso/boot/
cp -v $TREE/rootfs/usr/lib/grub/i386-frugalware/stage2_eltorito
$TREE/iso/boot/grub/
+umount $TREE/rootfs
cat $TREE/iso/boot/grub/menu.lst EOF
default=0
timeout=5
diff --git a/create-rootfs.sh b/create-rootfs.sh
index 67dc08f..82957e4 100755
--- a/create-rootfs.sh
+++ b/create-rootfs.sh
@@ -8,8 +8,12 @@ if [ `id -u` != 0 ]; then
exit 1
fi
-# Create empty dir
-rm -rf $CHROOTDIR
+# Mount loop
+mkdir -p $CHROOTDIR
+rm -f $TREE/rootfs.img
+dd if=/dev/zero of=$TREE/rootfs.img bs=1M count=1024
+mkfs.ext4 -F $TREE/rootfs.img
+mount -o loop $TREE/rootfs.img $CHROOTDIR
mkdir -p $CHROOTDIR/{etc,proc,sys,var/cache/pacman-g2,var/tmp/fst,tmp,var/log}
# Mount chroot
@@ -19,6 +23,34 @@ mount -t sysfs none $CHROOTDIR/sys /dev/null
mount -o bind /var/cache/pacman-g2 $CHROOTDIR/var/cache/pacman-g2 /dev/null
echo Successfully mounted chroot directories.
+# Pre-install tweaks
+mkdir -p $CHROOTDIR/etc/{profile.d,sysconfig}
+## file /etc/profile.d/lang.sh
+echo export LANG=$FWLIVELANG $CHROOTDIR/etc/profile.d/lang.sh
+echo export LC_ALL=\$LANG $CHROOTDIR/etc/profile.d/lang.sh
+if [ `echo $FWLIVELANG|sed 's/.*\.\(.*\).*/\1/'` == utf8 ]; then
+ echo export CHARSET=utf-8 $CHROOTDIR/etc/profile.d/lang.sh
+else
+ case $FWLIVELANG in
+ en_US)
+ echo export CHARSET=iso-8859-1
$CHROOTDIR/etc/profile.d/lang.sh ;;
+ fr_FR)
+ echo export CHARSET=iso-8859-15
$CHROOTDIR/etc/profile.d/lang.sh;;
+ *)
+ echo export CHARSET=iso-8859-15
$CHROOTDIR/etc/profile.d/lang.sh;;
+ esac
+fi
+chmod +x $CHROOTDIR/etc/profile.d/lang.sh
+## file /etc/sysconfig/keymap
+## TODO:To improve the function ( ex : for french keymap=fr-latin1 )
+case $FWLIVELANG in
+ en_*)
+ keymap=us ;;
+ *)
+ keymap=`echo $FWLIVELANG |sed 's/_.*//'` ;;
+esac
+echo keymap=$keymap $CHROOTDIR/etc/sysconfig/keymap
+
# Build it
echo Building chroot environment
if [ -e pacman-g2.conf ]; then
@@ -33,9 +65,20 @@ fi
echo Server =
http://ftp.frugalware.org/pub/frugalware/frugalware-$TREE/frugalware-$ARCH;
pacman-g2.conf
pacman -Sy base -r $CHROOTDIR --noconfirm --config pacman-g2.conf
-# Umount
+# Post-install tweaks
+chroot $CHROOTDIR sh -c 'echo root:fwlive | chpasswd'
+
+# Umount chroot
echo Attempting to umount chroot directories...
umount $CHROOTDIR/proc /dev/null
umount $CHROOTDIR/sys /dev/null
umount $CHROOTDIR/var/cache/pacman-g2 /dev/null
echo Successfully umounted chroot directories.
+
+# Umount loop
+df -h $CHROOTDIR
+umount $CHROOTDIR
+rmdir $CHROOTDIR
+# TODO see later if this reduces size
+#e2fsck -f rootfs.img
+#resize2fs rootfs.img -M
diff --git a/create-squash.sh b/create-squash.sh
index 457d9de..f6c2267 100755
--- a/create-squash.sh
+++ b/create-squash.sh
@@ -7,50 +7,6 @@ if [ `id -u` != 0 ]; then
exit 1
fi
-## Password root
-chroot $CHROOTDIR sh -c 'echo root:fwlive | chpasswd'
-## file /etc/profile.d/lang.sh
-## TODO:Make /etc/profile.d/less.sh, /etc/locale.conf and finish export charset
-echo export LANG=$FWLIVELANG $CHROOTDIR/etc/profile.d/lang.sh
-echo export LC_ALL=\$LANG $CHROOTDIR/etc/profile.d/lang.sh
-if [ `echo $FWLIVELANG|sed 's/.*\.\(.*\).*/\1/'` == utf8 ]; then
- echo export CHARSET=utf-8 $CHROOTDIR/etc/profile.d/lang.sh
-else
- case $FWLIVELANG in
- en_US)
- echo export CHARSET=iso-8859-1
$CHROOTDIR/etc/profile.d/lang.sh ;;
- fr_FR)
- echo export CHARSET=iso-8859-15
$CHROOTDIR/etc/profile.d/lang.sh;;
- *)
- echo export CHARSET=iso-8859-15
$CHROOTDIR/etc/profile.d/lang.sh;;
- esac
-fi
-chmod +x $CHROOTDIR/etc/profile.d/lang.sh
-## file /etc/sysconfig/keymap
-## TODO:To improve the function ( ex : for french keymap=fr-latin1 )
-case $FWLIVELANG in
- en_*)
- keymap=us ;;
- *)
- keymap=`echo $FWLIVELANG |sed 's/_.*//'` ;;
-esac
-echo keymap=$keymap $CHROOTDIR/etc/sysconfig/keymap
-
-
-rm -f $TREE/rootfs.img
-dd if=/dev/zero of=$TREE/rootfs.img bs=1M count=1024
-mkfs.ext4 -F
[Frugalware-git] kdebump: kdenetwork-4.7.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=fdd7ee639d851b578282ac164d515956dfe95cb4 commit fdd7ee639d851b578282ac164d515956dfe95cb4 Author: Melko me...@frugalware.org Date: Thu Nov 3 01:29:38 2011 +0100 kdenetwork-4.7.3-1-i686 * version bump diff --git a/source/kde/kdenetwork/FrugalBuild b/source/kde/kdenetwork/FrugalBuild index 884e8bb..68f6b65 100644 --- a/source/kde/kdenetwork/FrugalBuild +++ b/source/kde/kdenetwork/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 5.00 SBU +# Compiling Time: 5.01 SBU # Maintainer: centuri0 achevaux at gmail dot com pkgname=kdenetwork ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: rootfs: create sparse file
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=00ad4c966b40f783757a40d63c3a95bd5f3cc416
commit 00ad4c966b40f783757a40d63c3a95bd5f3cc416
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 3 01:38:16 2011 +0100
rootfs: create sparse file
diff --git a/create-rootfs.sh b/create-rootfs.sh
index 4692eac..eea9af9 100755
--- a/create-rootfs.sh
+++ b/create-rootfs.sh
@@ -11,7 +11,7 @@ fi
# Mount loop
mkdir -p $CHROOTDIR
rm -f $TREE/rootfs.img
-dd if=/dev/zero of=$TREE/rootfs.img bs=1M count=1024
+dd if=/dev/zero of=$TREE/rootfs.img bs=1 count=0 seek=1G
mkfs.ext4 -F $TREE/rootfs.img
mount -o loop $TREE/rootfs.img $CHROOTDIR
mkdir -p $CHROOTDIR/{etc,proc,sys,var/cache/pacman-g2,var/tmp/fst,tmp,var/log}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: add /etc/fstab
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=2702caf9ffec909524f8d3658a49d0b052c9d65d commit 2702caf9ffec909524f8d3658a49d0b052c9d65d Author: Miklos Vajna vmik...@frugalware.org Date: Thu Nov 3 01:25:19 2011 +0100 add /etc/fstab diff --git a/TODO b/TODO index e59..3aa57be 100644 --- a/TODO +++ b/TODO @@ -15,7 +15,6 @@ the result in qemu. TODO: - make bootable iso - merge with parent dir, that will fix bugs like: - - missing config files (/etc/profile.d/lang.sh, fstab, /etc/sysconfig/keymap) - dhcp is not the default - silence pointless warnings - avoid pointless hardwired strings diff --git a/create-rootfs.sh b/create-rootfs.sh index 82957e4..4692eac 100755 --- a/create-rootfs.sh +++ b/create-rootfs.sh @@ -50,6 +50,14 @@ case $FWLIVELANG in keymap=`echo $FWLIVELANG |sed 's/_.*//'` ;; esac echo keymap=$keymap $CHROOTDIR/etc/sysconfig/keymap +# file /etc/fstab - just to make systemd-remount-api-vfs.service happy +cat $CHROOTDIR/etc/fstab EOF +none /procprocdefaults 0 0 +none /sys sysfs defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +usbfs/proc/bus/usbusbfs devgid=23,devmode=664 0 0 +tmpfs/dev/shm tmpfs defaults 0 0 +EOF # Build it echo Building chroot environment ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: enable dhcp by default
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=2fcbe508dd68ba3eb2925b8c778fbfdba293b968
commit 2fcbe508dd68ba3eb2925b8c778fbfdba293b968
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Nov 3 01:38:38 2011 +0100
enable dhcp by default
diff --git a/TODO b/TODO
index 3aa57be..72555c2 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,5 @@ the result in qemu.
TODO:
- make bootable iso
-- merge with parent dir, that will fix bugs like:
- - dhcp is not the default
- silence pointless warnings
- avoid pointless hardwired strings
diff --git a/create-rootfs.sh b/create-rootfs.sh
index eea9af9..b9b8c03 100755
--- a/create-rootfs.sh
+++ b/create-rootfs.sh
@@ -24,7 +24,7 @@ mount -o bind /var/cache/pacman-g2
$CHROOTDIR/var/cache/pacman-g2 /dev/null
echo Successfully mounted chroot directories.
# Pre-install tweaks
-mkdir -p $CHROOTDIR/etc/{profile.d,sysconfig}
+mkdir -p $CHROOTDIR/etc/{profile.d,sysconfig/network}
## file /etc/profile.d/lang.sh
echo export LANG=$FWLIVELANG $CHROOTDIR/etc/profile.d/lang.sh
echo export LC_ALL=\$LANG $CHROOTDIR/etc/profile.d/lang.sh
@@ -58,6 +58,9 @@ devpts /dev/pts devpts gid=5,mode=620
0 0
usbfs/proc/bus/usbusbfs devgid=23,devmode=664 0 0
tmpfs/dev/shm tmpfs defaults 0 0
EOF
+# file /etc/sysconfig/network/default
+echo [eth0] $CHROOTDIR/etc/sysconfig/network/default
+echo options = dhcp $CHROOTDIR/etc/sysconfig/network/default
# Build it
echo Building chroot environment
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: avoid implicit make rules
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=d0e8099194dab8e7925045f88b38643a3208f330 commit d0e8099194dab8e7925045f88b38643a3208f330 Author: Miklos Vajna vmik...@frugalware.org Date: Thu Nov 3 02:14:53 2011 +0100 avoid implicit make rules diff --git a/Makefile b/Makefile index b23fb81..96693dd 100644 --- a/Makefile +++ b/Makefile @@ -5,23 +5,25 @@ all: create-iso @echo Now burn your iso and have fun! +.PHONY: create-rootfs create-squash create-iso boot clean + create-rootfs: create-rootfs.stamp create-rootfs.stamp: - ./create-rootfs.sh + bin/create-rootfs touch $@ -create-squash: create-squash.stamp -create-squash.stamp: create-rootfs - ./create-squash.sh +create-squash: create-squash.stamp create-rootfs +create-squash.stamp: + bin/create-squash touch $@ -create-iso: create-iso.stamp -create-iso.stamp: create-squash - ./create-iso.sh +create-iso: create-iso.stamp create-squash +create-iso.stamp: + bin/create-iso touch $@ boot: create-iso - ./boot-qemu.sh + bin/boot-qemu clean: git clean -x -d -f diff --git a/boot-qemu.sh b/bin/boot-qemu similarity index 100% rename from boot-qemu.sh rename to bin/boot-qemu diff --git a/create-iso.sh b/bin/create-iso similarity index 100% rename from create-iso.sh rename to bin/create-iso diff --git a/create-rootfs.sh b/bin/create-rootfs similarity index 100% rename from create-rootfs.sh rename to bin/create-rootfs diff --git a/create-squash.sh b/bin/create-squash similarity index 100% rename from create-squash.sh rename to bin/create-squash ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwlive: these rules can be avoided
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=8ed8b1557280d8d71869bf0ef81bdb52061388c0 commit 8ed8b1557280d8d71869bf0ef81bdb52061388c0 Author: Miklos Vajna vmik...@frugalware.org Date: Thu Nov 3 02:28:57 2011 +0100 these rules can be avoided diff --git a/Makefile b/Makefile index 96693dd..901c60f 100644 --- a/Makefile +++ b/Makefile @@ -2,27 +2,22 @@ # Makefile for livecd creation # -all: create-iso +all: create-iso.stamp @echo Now burn your iso and have fun! -.PHONY: create-rootfs create-squash create-iso boot clean - -create-rootfs: create-rootfs.stamp create-rootfs.stamp: bin/create-rootfs touch $@ -create-squash: create-squash.stamp create-rootfs -create-squash.stamp: +create-squash.stamp: create-rootfs.stamp bin/create-squash touch $@ -create-iso: create-iso.stamp create-squash -create-iso.stamp: +create-iso.stamp: create-squash.stamp bin/create-iso touch $@ -boot: create-iso +boot: create-iso.stamp bin/boot-qemu clean: ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add mount_directory function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=36834e2ce37cf943039bd8aa739e94ee452fc4ba
commit 36834e2ce37cf943039bd8aa739e94ee452fc4ba
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 23:37:17 2011 -0500
fw32.c: add mount_directory function
diff --git a/fw32.c b/fw32.c
index d4ae7e0..96b86f3 100644
--- a/fw32.c
+++ b/fw32.c
@@ -4,6 +4,7 @@
#include stdbool.h
#include string.h
#include sys/stat.h
+#include sys/mount.h
#include limits.h
#include errno.h
#include assert.h
@@ -76,7 +77,7 @@ mkdir_parents(const char *s)
}
static bool
-is_mounted(const char *path)
+ismounted(const char *path)
{
FILE *f;
char line[LINE_MAX], *s, *e;
@@ -118,4 +119,21 @@ is_mounted(const char *path)
return found;
}
+static void
+mount_directory(const char *src)
+{
+ char dst[PATH_MAX];
+
+ assert(src);
+
+ snprintf(dst,sizeof dst,%s%s,FW32_ROOT,src);
+
+ if(ismounted(dst))
+return;
+
+ if(mount(src,dst,,MS_BIND,))
+error(Failed to mount directory: %s: %s\n,dst,strerror(errno));
+}
+
+
int main(int argc,char **argv) { mkdir_parents(argv[1]); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: use mkdir RV to satisfy hermier
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=58e40bc67373fa7d3272aa51a3fc34c86289be2c
commit 58e40bc67373fa7d3272aa51a3fc34c86289be2c
Author: James Buren r...@frugalware.org
Date: Wed Nov 2 23:39:46 2011 -0500
fw32.c: use mkdir RV to satisfy hermier
diff --git a/fw32.c b/fw32.c
index 96b86f3..dc911fb 100644
--- a/fw32.c
+++ b/fw32.c
@@ -60,19 +60,11 @@ mkdir_parents(const char *s)
{
*p = 0;
-errno = 0;
-
-mkdir(path,0755);
-
-if(errno errno != EEXIST)
+if(mkdir(path,0755) errno != EEXIST)
error(Failed to create parent directory: %s: %s\n,path,strerror(errno));
}
- errno = 0;
-
- mkdir(path,0755);
-
- if(errno errno != EEXIST)
+ if(mkdir(path,0755) errno != EEXIST)
error(Failed to create directory: %s: %s\n,path,strerror(errno));
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add umount_directory function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=c9d1b8407c54e5d82038e67e59a119edcae649ae
commit c9d1b8407c54e5d82038e67e59a119edcae649ae
Author: James Buren r...@frugalware.org
Date: Thu Nov 3 00:06:25 2011 -0500
fw32.c: add umount_directory function
diff --git a/fw32.c b/fw32.c
index dc911fb..4320d10 100644
--- a/fw32.c
+++ b/fw32.c
@@ -127,5 +127,13 @@ mount_directory(const char *src)
error(Failed to mount directory: %s: %s\n,dst,strerror(errno));
}
+static void
+umount_directory(const char *path)
+{
+ assert(path);
+
+ if(umount2(path,UMOUNT_NOFOLLOW) errno != EINVAL)
+error(Failed to umount directory: %s: %s\n,path,strerror(errno));
+}
-int main(int argc,char **argv) { mkdir_parents(argv[1]); }
+int main(int argc,char **argv) { umount_directory(argv[1]); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add mount_all function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=5ec252969f0c462db4edd9f02bda3a833221
commit 5ec252969f0c462db4edd9f02bda3a833221
Author: James Buren r...@frugalware.org
Date: Thu Nov 3 00:13:07 2011 -0500
fw32.c: add mount_all function
diff --git a/fw32.c b/fw32.c
index 4320d10..1c7ca26 100644
--- a/fw32.c
+++ b/fw32.c
@@ -28,7 +28,8 @@ static const char *FW32_DIRS[] =
/usr/share/fonts,
/usr/share/themes,
/media,
- /mnt
+ /mnt,
+ 0
};
static void
@@ -136,4 +137,13 @@ umount_directory(const char *path)
error(Failed to umount directory: %s: %s\n,path,strerror(errno));
}
+static void
+mount_all(void)
+{
+ const char **p;
+
+ for( p = FW32_DIRS ; *p ; ++p )
+mount_directory(*p);
+}
+
int main(int argc,char **argv) { umount_directory(argv[1]); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add umount_all function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=13953ae03097c84556d6b77b9b68bdece98d0ef7
commit 13953ae03097c84556d6b77b9b68bdece98d0ef7
Author: James Buren r...@frugalware.org
Date: Thu Nov 3 00:29:36 2011 -0500
fw32.c: add umount_all function
diff --git a/fw32.c b/fw32.c
index 1c7ca26..3e8cc89 100644
--- a/fw32.c
+++ b/fw32.c
@@ -146,4 +146,36 @@ mount_all(void)
mount_directory(*p);
}
-int main(int argc,char **argv) { umount_directory(argv[1]); }
+static void
+umount_all(void)
+{
+ FILE *f;
+ char line[LINE_MAX], *s, *e;
+
+ f = fopen(/proc/mounts,rb);
+
+ if(!f)
+error(Cannot open /proc/mounts for reading.\n);
+
+ while(fgets(line,sizeof line,f))
+ {
+s = strchr(line,' ');
+
+if(!s)
+ continue;
+
+e = strchr(++s,' ');
+
+if(!e)
+ continue;
+
+*e = 0;
+
+if(strncmp(s,FW32_ROOT,strlen(FW32_ROOT)))
+ umount_directory(s);
+ }
+
+ fclose(f);
+}
+
+int main(int argc,char **argv) { printf(%d\n,sizeof(FW32_ROOT)); }
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fw32: fw32.c: add xstrdup xmalloc
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=650a1ae73c6ffa76bf45f0a83c768926b5c148ab
commit 650a1ae73c6ffa76bf45f0a83c768926b5c148ab
Author: James Buren r...@frugalware.org
Date: Thu Nov 3 00:55:13 2011 -0500
fw32.c: add xstrdup xmalloc
diff --git a/fw32.c b/fw32.c
index 3e8cc89..a8f36ab 100644
--- a/fw32.c
+++ b/fw32.c
@@ -7,6 +7,7 @@
#include sys/mount.h
#include limits.h
#include errno.h
+#include unistd.h
#include assert.h
static const char *FW32_ROOT = /usr/lib/fw32;
@@ -48,6 +49,34 @@ error(const char *fmt,...)
exit(EXIT_FAILURE);
}
+static void *
+xmalloc(size_t n)
+{
+ void *p;
+
+ assert(n);
+
+ p = malloc(n);
+
+ if(!p)
+error(malloc: %s\n,strerror(errno));
+
+ return p;
+}
+
+static char *
+xstrdup(const char *s)
+{
+ char *p;
+
+ p = strdup(s);
+
+ if(!p)
+error(strdup: %s\n,strerror(errno));
+
+ return p;
+}
+
static void
mkdir_parents(const char *s)
{
@@ -118,12 +147,12 @@ mount_directory(const char *src)
char dst[PATH_MAX];
assert(src);
-
+
snprintf(dst,sizeof dst,%s%s,FW32_ROOT,src);
if(ismounted(dst))
return;
-
+
if(mount(src,dst,,MS_BIND,))
error(Failed to mount directory: %s: %s\n,dst,strerror(errno));
}
@@ -151,7 +180,7 @@ umount_all(void)
{
FILE *f;
char line[LINE_MAX], *s, *e;
-
+
f = fopen(/proc/mounts,rb);
if(!f)
@@ -174,7 +203,7 @@ umount_all(void)
if(strncmp(s,FW32_ROOT,strlen(FW32_ROOT)))
umount_directory(s);
}
-
+
fclose(f);
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
