Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 19 Nov 2014 23:34:54 +0100
From: John Spencer <maillist-musl@...fooze.de>
To:  sabotage@...ts.openwall.com
Subject: Re: New packages: mplayer, bdftopcf, mkfontdir, mkfontscale.
 And COOKBOOK uninstall package information

Henrique Lengler wrote:
> I added some packages and I inserted a line about uninstalling packages
> in the COOKBOOK.
> 
> Patches attached.

thanks, see comments below

> 
> Regards,
> 
> 
> ------------------------------------------------------------------------
> 
>>>From 8ae2aa5ce3ec8eba6af56434eb7dba1de79802f8 Mon Sep 17 00:00:00 2001
> From: Henrique Lengler <henriqueleng@...nmailbox.org>
> Date: Wed, 19 Nov 2014 02:01:25 +0000
> Subject: [PATCH] added bdftopcf
> 
> ---
>  pkg/bdftopcf | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 pkg/bdftopcf
> 
> diff --git a/pkg/bdftopcf b/pkg/bdftopcf
> new file mode 100644
> index 0000000..08a33d1
> --- /dev/null
> +++ b/pkg/bdftopcf
> @@ -0,0 +1,22 @@
> +[main]
> +filesize=144722
> +sha512=399470bd1d08c67c75631a684fe63a5df6e5e18a7a95c33e516580b4dc74dd05ba02146be467793f3a40f526a3d6649797e124fd1ca1477a550b880ccf645079
> +tardir=bdftopcf-1.0.4
> +
> +[mirrors]
> +http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.4.tar.gz
> +
> +[deps]
> +libxfont
> +
> +[build]
> +[ -n "$CROSS_COMPILE" ] && \
> +  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') --build=$($HOSTCC -dumpmachine)"

interesting addition to the xconfflags setting. did you actually try to 
cross-compile and required the --build parameter ? because i never 
needed it so far for the ~300 packages that cross-compile successfully.

> +
> +CFLAGS="$optcflags" LDFLAGS="$optldflags" \
> +./configure --prefix="$butch_prefix" \
> +	--mandir="$butch_prefix"/share/man
> +
> +make -j$MAKE_THREADS
> +make DESTDIR="$butch_install_dir" install
> +
> 
> 
> ------------------------------------------------------------------------
> 
>>>From 6880761e169408dea174facaf00cd04cabac7e3a Mon Sep 17 00:00:00 2001
> From: Henrique Lengler <henriqueleng@...nmailbox.org>
> Date: Wed, 19 Nov 2014 02:02:24 +0000
> Subject: [PATCH] added mkfontdir
> 
> ---
>  pkg/mkfontdir | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 pkg/mkfontdir
> 
> diff --git a/pkg/mkfontdir b/pkg/mkfontdir
> new file mode 100644
> index 0000000..feb80c3
> --- /dev/null
> +++ b/pkg/mkfontdir
> @@ -0,0 +1,22 @@
> +[main]
> +filesize=108195
> +sha512=96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f
> +
> +[mirrors]
> +http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
> +
> +[deps]
> +mkfontscale
> +
> +[build]
> +
> +[ -n "$CROSS_COMPILE" ] && \
> +  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') \
> +  --with-sysroot=$butch_root_dir"
> +
> +CPPFLAGS="-D_GNU_SOURCE" CFLAGS="$optcflags" CXXFLAGS="$optcflags" \
> +LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
> +  ./configure -C --prefix="$butch_prefix" --disable-nls $xconfflags
> +
> +make V=1 -j$MAKE_THREADS
> +make DESTDIR="$butch_install_dir" install
> 
> 
> ------------------------------------------------------------------------
> 
>>>From e36c26c20f6f11a16ebf0c4b15044b703114be90 Mon Sep 17 00:00:00 2001
> From: Henrique Lengler <henriqueleng@...nmailbox.org>
> Date: Wed, 19 Nov 2014 02:03:11 +0000
> Subject: [PATCH] added mkfontscale
> 
> ---
>  pkg/mkfontscale | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>  create mode 100644 pkg/mkfontscale
> 
> diff --git a/pkg/mkfontscale b/pkg/mkfontscale
> new file mode 100644
> index 0000000..ca2367f
> --- /dev/null
> +++ b/pkg/mkfontscale
> @@ -0,0 +1,20 @@
> +[main]
> +filesize=139923
> +sha512=7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220
> +
> +[mirrors]
> +http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.1.tar.bz2
> +
> +[deps]
> +
> +[build]
> +[ -n "$CROSS_COMPILE" ] && \
> +  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') \
> +  --with-sysroot=$butch_root_dir"
> +
> +CPPFLAGS="-D_GNU_SOURCE" CFLAGS="$optcflags" CXXFLAGS="$optcflags" \
> +LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
> +  ./configure -C --prefix="$butch_prefix" --disable-nls $xconfflags
> +
> +make V=1 -j$MAKE_THREADS
> +make DESTDIR="$butch_install_dir" install
> 
> 
> ------------------------------------------------------------------------
> 
>>>From cf32583c9a25fee87255ec8ffb76f7fbda87e4e0 Mon Sep 17 00:00:00 2001
> From: Henrique Lengler <henriqueleng@...nmailbox.org>
> Date: Wed, 19 Nov 2014 01:56:03 +0000
> Subject: [PATCH] added mplayer

you've seen the mpv package, right ? just asking cause i kinda don't see 
how one would prefer mplayer over mpv...

> 
> ---
>  KEEP/x11-libs.patch | 10 ++++++++++
>  pkg/mplayer         | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 63 insertions(+)
>  create mode 100644 KEEP/x11-libs.patch
>  create mode 100644 pkg/mplayer
> 
> diff --git a/KEEP/x11-libs.patch b/KEEP/x11-libs.patch
> new file mode 100644
> index 0000000..4e6f8b5
> --- /dev/null
> +++ b/KEEP/x11-libs.patch
> @@ -0,0 +1,10 @@
> +--- ./configure.orig
> ++++ ./configure
> +@@ -4394,6 +4394,7 @@
> + if test "$_x11" = yes ; then
> +   def_x11='#define CONFIG_X11 1'
> +   vomodules="x11 xover $vomodules"
> ++  libs_mplayer="$libs_mplayer -lX11 -lXext"
> + else
> +   _x11=no
> +   def_x11='#undef CONFIG_X11'
> diff --git a/pkg/mplayer b/pkg/mplayer
> new file mode 100644
> index 0000000..1fd9622
> --- /dev/null
> +++ b/pkg/mplayer
> @@ -0,0 +1,53 @@
> +[main]
> +filesize=11202492
> +sha512=06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed
> +
> +[mirrors]
> +http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz
> +
> +[deps]
> +libtheora
> +libxxf86dga
> +libxv
> +libmad
> +libao
> +zlib
> +sdl
> +x11-font-dejavu
> +libxvmc
> +alsa-lib
> +mesalib
> +yasm
> +libpng
> +
> +[build]
> +patch -p1 < "$K"/x11-libs.patch
> +
> +[ -n "$CROSS_COMPILE" ] && \
> +  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') \
> +  --with-sysroot=$butch_root_dir"
> +
> +CPPFLAGS="-D_GNU_SOURCE" CFLAGS="$optcflags" CXXFLAGS="$optcflags" \
> +LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
> +  ./configure --prefix="$butch_prefix" \
> +	--disable-gui \
> +	--disable-gif \
> +	--disable-arts \
> +        --enable-x11 \

nothing crucial, but it would be nicer if the alignment would use tabs 
or spaces everywhere

> +        --enable-runtime-cpudetection \
> +        --disable-nas \
> +        --enable-gl \
> +        --disable-musepack \
> +	--disable-mp3lib \
> +	--disable-ossaudio \
> +	--disable-pulse \
> +	--disable-openal \
> +	--disable-mp3lib \
> +	--disable-esd \
> +	--disable-mga \
> +	--disable-lirc \
> +	--enable-xvmc \
> +	--disable-nemesi
> +
> +make V=1 -j$MAKE_THREADS
> +make DESTDIR="$butch_install_dir" install
> 
> 
> ------------------------------------------------------------------------
> 
>>>From ab54dcc7afef3d7748fc71133bae8a9e5ae3faab Mon Sep 17 00:00:00 2001
> From: Henrique Lengler <henriqueleng@...nmailbox.org>
> Date: Wed, 19 Nov 2014 01:49:44 +0000
> Subject: [PATCH] added uninstall package information
> 
> ---
>  COOKBOOK | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/COOKBOOK b/COOKBOOK
> index 0a01ec9..17c92d2 100644
> --- a/COOKBOOK
> +++ b/COOKBOOK
> @@ -33,6 +33,9 @@ see the wiki page "boostrap to hd image" or utils/write-hd-image.sh
>    use "butch unlink" command to remove symlinks to a specific package.
>    use "butch relink" command to create symlinks for a pkg which is unlinked.
>  
> +  if you want to entirely remove a package, delete /opt/$pkg, butch unlink $pkg, and 
> +  delete the $pkg line from /var/lib/butch.db

good catch.

> +
>  == Bootstrapping the system
>  
>  see README.

Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ