diff --git a/Makefile b/Makefile index 4750103f56e..d3544bf6dc0 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,5 @@ all: cd utils && make + +clean: + cd utils && make clean diff --git a/TODO b/TODO new file mode 100644 index 00000000000..58b690a7ef0 --- /dev/null +++ b/TODO @@ -0,0 +1,4 @@ +* Autodetect extract suffix for files with version numbers like 0.10.21 (gstreamer) + - extract suffix is ignored in pkg desc (should be allow it?) +* wget now is required inside the chroot + - etc/resolv.conf is copied before entering the chroot diff --git a/helper-templates/chroot.sh b/helper-templates/chroot.sh index f114eef4357..4204379fa52 100644 --- a/helper-templates/chroot.sh +++ b/helper-templates/chroot.sh @@ -27,7 +27,7 @@ if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then echo -n "==> Preparing chroot on $XBPS_MASTERDIR... " chown -R root:root $XBPS_MASTERDIR/* chmod +s $XBPS_MASTERDIR/usr/libexec/pt_chown - cp -af /etc/passwd /etc/shadow /etc/group /etc/hosts $XBPS_MASTERDIR/etc + cp -af /etc/passwd /etc/shadow /etc/group /etc/hosts /etc/resolv.conf $XBPS_MASTERDIR/etc touch $XBPS_MASTERDIR/.xbps_perms_done echo "done." else diff --git a/templates/gstreamer.tmpl b/templates/gstreamer.tmpl new file mode 100644 index 00000000000..209598e1a39 --- /dev/null +++ b/templates/gstreamer.tmpl @@ -0,0 +1,24 @@ +# XXX this package is broken -- extension is not autodetected +pkgname=gstreamer +version=0.10.21 +distfiles=" +http://gstreamer.freedesktop.org/src/gstreamer/$pkgname-$version.tar.gz" +#extract_sufx=".tar.gz" ## XXX this is ignored +build_style=gnu_configure +#make_cmd="$XBPS_MASTERDIR/bin/gmake" ## XXX why? +pkgconfig_override="gstreamer-0.10.pc" +short_desc="Core GStreamer libraries and elements" +maintainer="pancake " +checksum=a04b49da2ce4614ff0a2d607cfc018a754571e0881ff3b08b69ee59be0ccf434 +#bz2..checksum=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3 +long_desc=" +GStreamer is a library for constructing of graphs of media-handling components. +The use cases it covers range from simple Ogg/Vorbis playback, audio/video streaming +to complex audio (mixing) and video (non-linear editing) processing. + +Applications can take advantage of advances in codec and filter technology +transparently. Developers can add new codecs and filters by writing a simple plugin +with a clean, generic interface." + +# Update db modules files once installed. +#postinstall_helpers="gtk-update-immodules.sh gtk-update-gdkpixbufloaders.sh" diff --git a/templates/wget.tmpl b/templates/wget.tmpl new file mode 100644 index 00000000000..fc0511cf2eb --- /dev/null +++ b/templates/wget.tmpl @@ -0,0 +1,35 @@ +# Template file for 'gawk' +pkgname=wget +version=1.11.4 +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +build_style=gnu_configure +short_desc="The GNU wget utility" +maintainer="pancake " +checksum=7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3 +configure_args="--without-ssl" +long_desc=" + GNU Wget is a free software package for retrieving files using HTTP, + HTTPS and FTP, the most widely-used Internet protocols. It is a + non-interactive commandline tool, so it may easily be called from scripts, + cron jobs, terminals without X-Windows support, etc. + +GNU Wget has many features to make retrieving large files or mirroring +entire web or FTP sites easy, including: + + * Can resume aborted downloads, using REST and RANGE + * Can use filename wild cards and recursively mirror directories + * NLS-based message files for many different languages + * Optionally converts absolute links in downloaded documents to relative, + so that downloaded documents may link to each other locally + * Runs on most UNIX-like operating systems as well as Microsoft Windows + * Supports HTTP proxies and cookies + * Supports persistent HTTP connections + * Unattended / background operation + * Uses local file timestamps to determine whether documents need to be + re-downloaded when mirroring + * GNU Wget is distributed under the GNU General Public License." + +base_chroot=yes +run_depends="glibc-2.8" +# TODO : Add openssl dependency +# openssl" diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl index 37682a73e27..7dbc21adbd9 100644 --- a/templates/xbps-base-chroot.tmpl +++ b/templates/xbps-base-chroot.tmpl @@ -11,4 +11,5 @@ long_desc=" base_chroot=yes build_depends="glibc-2.8 kernel-headers-2.6.27.3 bash-3.2 coreutils-6.12 tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 findutils-4.4.0 - sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4" + sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4 + wget-1.11.4" diff --git a/utils/Makefile b/utils/Makefile index 3db5d02f1ce..35c38cb8acb 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -3,7 +3,7 @@ PREFIX ?= /usr/local PKGDB_CFLAGS += -Wall -Werror -I$(PREFIX)/include PKGDB_LDFLAGS += -lprop -all: xbps-digest xbps-pkgdb clean_objs +all: xbps-digest xbps-pkgdb xbps-digest: xbps-digest.o $(CC) $(CFLAGS) $< -o $@ diff --git a/xbps.sh b/xbps.sh index 49021cb7872..b5fca88b6b2 100755 --- a/xbps.sh +++ b/xbps.sh @@ -429,7 +429,7 @@ extract_distfiles() fi ;; *) - msg_error "cannot guess $curfile extract suffix." + msg_error "cannot guess $curfile extract suffix. ($cursufx)" exit 1 ;; esac