diff options
44 files changed, 729 insertions, 490 deletions
diff --git a/libre/aufs2-libre/create-tarball.sh b/libre/aufs2-libre/create-tarball.sh index a460a8b3b..a460a8b3b 100755..100644 --- a/libre/aufs2-libre/create-tarball.sh +++ b/libre/aufs2-libre/create-tarball.sh diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD index c77ad16b5..dc5725eff 100644 --- a/libre/ffmpeg-libre/PKGBUILD +++ b/libre/ffmpeg-libre/PKGBUILD @@ -5,18 +5,17 @@ # Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net> pkgname=ffmpeg-libre -pkgver=20110121 +pkgver=20110330 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg') -makedepends=('yasm') -#remake snapshot with: svn export svn://svn.ffmpeg.org/ffmpeg/trunk/@25472 +makedepends=('yasm' 'git') +#git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz) -md5sums=('73080643ae7702d4164da92b9e6fedb6') -options=('force') +md5sums=('dd682a876a496b9f9ae8afb3b3b70389') #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2) provides=('ffmpeg') conflicts=('ffmpeg') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index bdfbee155..7a9630c34 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=filesystem -pkgver=2010.12 -pkgrel=2 +pkgver=2011.04 +pkgrel=1.1 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -18,23 +18,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') -md5sums=('75c7e1770305e1f3b75c52785c137611' - '140787c0dc6f3f1272cfd381b92b0155' - '13753e4e0964f3652b0cc60a28528bdf' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ef40305da5803ca69d22e428ffc2ab9b' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - '59768b5f4080b96b67bcde5f66984ad5' - '51ac5c337236235bf8fe85a9b07b6db1' - '8098ffd9fbf890468d3198277596b85a') package() { cd ${srcdir} @@ -42,7 +25,7 @@ package() { # # setup root filesystem # - for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys; do + for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do install -d -m755 ${pkgdir}/${d} done install -d -m555 ${pkgdir}/proc @@ -93,3 +76,20 @@ package() { done ln -s ../man ${pkgdir}/usr/local/share/man } +md5sums=('772fe869b921698cc3e6fde73c4ac85a' + '140787c0dc6f3f1272cfd381b92b0155' + '13753e4e0964f3652b0cc60a28528bdf' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '8a9042a2cedf6b6b47eb8973f14289cb' + 'b8355d9d2782f424f4cedcf682651be0' + 'ef40305da5803ca69d22e428ffc2ab9b' + 'e5d8323a4dbee7a6d0d2a19cbf4b819f' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '6f48288b6fcaf0065fcb7b0e525413e0' + '40dac0de4c6b99c8ca97effbd7527c84' + 'd2dc4e39dbdea75b107f91789e3274ab' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + '8098ffd9fbf890468d3198277596b85a') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 4b2b261a4..640cd5c1d 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -2,6 +2,8 @@ post_install() { [ -f var/log/lastlog ] || : >var/log/lastlog [ -f var/log/wtmp ] || : >var/log/wtmp [ -f var/run/utmp ] || : >var/run/utmp + chown root:20 var/run/utmp + chmod 664 var/run/utmp [ -f var/log/btmp ] || (: >var/log/btmp && bin/chmod 600 var/log/btmp) # workaround for bug #7194 # readded due to bug #9465 @@ -32,6 +34,7 @@ post_upgrade() { _addgroup floppy -g 94 _addgroup storage -g 95 _addgroup log -g 19 + _addgroup utmp -g 20 _addgroup power -g 98 _addgroup network -g 90 _addgroup games -g 50 diff --git a/libre/filesystem/group b/libre/filesystem/group index 4bd635c47..261746d9e 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -13,6 +13,7 @@ ftp:x:11: mail:x:12: uucp:x:14: log:x:19:root +utmp:x:20: locate:x:21: rfkill:x:24: smmsp:x:25: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index 06b488fe9..ed176823e 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -13,6 +13,7 @@ ftp::: mail::: uucp::: log:::root +utmp:x:: locate::: rfkill:x:: smmsp::: diff --git a/libre/filesystem/profile b/libre/filesystem/profile index ccc07a4e5..3bc22db9f 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile @@ -10,7 +10,7 @@ export PATH # Load profiles from /etc/profile.d if test -d /etc/profile.d/; then for profile in /etc/profile.d/*.sh; do - test -r $profile && . $profile + test -r "$profile" && . "$profile" done unset profile fi diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 60582062a..4c2e4f7ec 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94631 2010-10-08 20:42:27Z andyrtr $ +# $Id$ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer (Parabola): xihh pkgname=ghostscript-libre -pkgver=9.01 -pkgrel=2 +pkgver=9.02 +pkgrel=1 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64') license=('GPL3') #non free files removed @@ -16,43 +16,18 @@ conflicts=('ghostscript') replaces=('ghostscript-lrpng' 'ghostscript') provides=('ghostscript-lprng' "ghostscript=$pkgver") url="http://www.ghostscript.com/" -source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.bz2 - ghostscript-fPIC.patch - ghostscript-system-jasper.patch - svn_rev11948.diff - ghostscript-gdevcups-691733.patch - gs_bug691759and691760.diff) +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) options=('!libtool' '!makeflags') -md5sums=('9824d6a21ad8b4a831f67601959f1181' - '766d44c47c693f96941b658e360c1277' - '03e27cd02471ab3b642c344fa06b623e' - '78f2b9c2d6a5a60891b2d8b593a15b00' - 'e459d4cf897bdb54fefbba9d57bd2fa2' - '21841b0ea5bd67cf4b68ba64c5d5755b') +md5sums=('f67151444bd56a7904579fc75a083dd6') build() { cd ${srcdir}/ghostscript-${pkgver} + # force it to use system-libs rm -rf jpeg libpng zlib jasper expat tiff # delete non-free packages grep -l "are not altered" Resource/CMap/* | xargs rm -fv - # fix build with systems jasper -# patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch - -# if [ "$CARCH" = "x86_64" ]; then -# patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch -# fi - - # part of https://bugs.archlinux.org/task/22006 - http://bugs.ghostscript.com/show_bug.cgi?id=691831 -# patch -Np2 -i ${srcdir}/svn_rev11948.diff - # upstream fix for http://bugs.ghostscript.com/show_bug.cgi?id=691733 / part of https://bugs.archlinux.org/task/21388 - # patch taken from Fedora RawHide master -# patch -Np1 -i ${srcdir}/ghostscript-gdevcups-691733.patch - # patch for http://bugs.ghostscript.com/show_bug.cgi?id=691760 and http://bugs.ghostscript.com/show_bug.cgi?id=691759 / part of https://bugs.archlinux.org/task/21388 -# patch -Np2 -i ${srcdir}/gs_bug691759and691760.diff - -# ./autogen.sh ./configure --prefix=/usr \ --enable-dynamic \ --with-ijs \ diff --git a/libre/ghostscript-libre/ghostscript-fPIC.patch b/libre/ghostscript-libre/ghostscript-fPIC.patch deleted file mode 100644 index 6f8999696..000000000 --- a/libre/ghostscript-libre/ghostscript-fPIC.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ghostscript-8.60-r8112/base/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100 -+++ ghostscript-8.60-r8112/base/lib.mak 2007-07-10 17:05:56.000000000 +0100 -@@ -874,7 +874,7 @@ - $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ - $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ -@@ -1077,7 +1077,7 @@ - - # Provide a mapping between StandardEncoding and ISOLatin1Encoding. - $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) -- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c -+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c - - ###### Create a pseudo-"feature" for the entire graphics library. - diff --git a/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch b/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch deleted file mode 100644 index 2f93f2e44..000000000 --- a/libre/ghostscript-libre/ghostscript-gdevcups-691733.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -up ghostscript-9.00/cups/gdevcups.c.gdevcups-691733 ghostscript-9.00/cups/gdevcups.c ---- ghostscript-9.00/cups/gdevcups.c.gdevcups-691733 2011-01-10 16:48:57.381703112 +0000 -+++ ghostscript-9.00/cups/gdevcups.c 2011-01-10 16:52:02.021813786 +0000 -@@ -2898,11 +2898,12 @@ cups_put_params(gx_device *pdev, /* - int margins_set; /* Were the margins set? */ - int size_set; /* Was the size set? */ - int color_set; /* Were the color attrs set? */ -- gdev_prn_space_params sp; /* Space parameter data */ -+ gdev_prn_space_params sp_old; /* Space parameter data */ - int width, /* New width of page */ - height, /* New height of page */ - width_old = 0, /* Previous width of page */ - height_old = 0; /* Previous height of page */ -+ bool transp_old = 0; /* Previous transparency usage state */ - ppd_attr_t *backside = NULL, - *backsiderequiresflippedmargins = NULL; - float swap; -@@ -2996,11 +2997,23 @@ cups_put_params(gx_device *pdev, /* - } \ - } - -+ sp_old = ((gx_device_printer *)pdev)->space_params; -+ width_old = pdev->width; -+ height_old = pdev->height; -+ transp_old = cups->page_uses_transparency; - size_set = param_read_float_array(plist, ".MediaSize", &arrayval) == 0 || - param_read_float_array(plist, "PageSize", &arrayval) == 0; - margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0; - color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 || - param_read_int(plist, "cupsBitsPerColor", &intval) == 0; -+ /* We set the old dimensions to 1 if we have a color depth change, so -+ that memory reallocation gets forced. This is perhaps not the correct -+ approach to prevent crashes like in bug 690435. We keep it for the -+ time being until we decide finally */ -+ if (color_set) { -+ width_old = 1; -+ height_old = 1; -+ } - /* We also recompute page size and margins if we simply get onto a new - page without necessarily having a page size change in the PostScript - code, as for some printers margins have to be flipped on the back sides of -@@ -3081,9 +3094,9 @@ cups_put_params(gx_device *pdev, /* - stringoption(cupsPageSizeName, "cupsPageSizeName"); - #endif /* CUPS_RASTER_SYNCv1 */ - -- if ((code = param_read_string(plist, "cups->Profile", &stringval)) < 0) -+ if ((code = param_read_string(plist, "cupsProfile", &stringval)) < 0) - { -- param_signal_error(plist, "cups->Profile", code); -+ param_signal_error(plist, "cupsProfile", code); - return (code); - } - else if (code == 0) -@@ -3096,7 +3109,7 @@ cups_put_params(gx_device *pdev, /* - - cups_set_color_info(pdev); - -- /* -+ /* - * Then process standard page device options... - */ - -@@ -3404,17 +3417,6 @@ cups_put_params(gx_device *pdev, /* - * does not keep track of the margins in the bitmap size... - */ - -- /* We set the old dimensions to -1 if we have a color depth change, so -- that memory reallocation gets forced. This is perhaps not the correct -- approach to preven crashes like in bug 690435. We keep it for the -- time being until we decide finally */ -- if (color_set) { -- width_old = -1; -- height_old = -1; -- } else { -- width_old = pdev->width; -- height_old = pdev->height; -- } - if (cups->landscape) - { - width = (pdev->MediaSize[1] - pdev->HWMargins[1] - pdev->HWMargins[3]) * -@@ -3457,11 +3459,10 @@ cups_put_params(gx_device *pdev, /* - pdev->MediaSize[0], pdev->MediaSize[1], width, height); - #endif /* DEBUG */ - -- sp = ((gx_device_printer *)pdev)->space_params; -- -- if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev, &sp, -+ if ((code = gdev_prn_maybe_realloc_memory((gx_device_printer *)pdev, -+ &sp_old, - width_old, height_old, -- cups->page_uses_transparency)) -+ transp_old)) - < 0) - return (code); - #ifdef DEBUG -@@ -3642,6 +3643,10 @@ cups_set_color_info(gx_device *pdev) /* - cups->header.cupsBitsPerPixel = cups->header.cupsBitsPerColor; - cups->color_info.depth = cups->header.cupsBitsPerPixel; - cups->color_info.num_components = 1; -+ cups->color_info.dither_grays = 1L << cups->header.cupsBitsPerColor; -+ cups->color_info.dither_colors = 1L << cups->header.cupsBitsPerColor; -+ cups->color_info.max_gray = cups->color_info.dither_grays - 1; -+ cups->color_info.max_color = cups->color_info.dither_grays - 1; - break; - - case CUPS_CSPACE_CMY : - diff --git a/libre/ghostscript-libre/ghostscript-system-jasper.patch b/libre/ghostscript-libre/ghostscript-system-jasper.patch deleted file mode 100644 index 444b76029..000000000 --- a/libre/ghostscript-libre/ghostscript-system-jasper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c ---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100 -+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000 -@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s - private_st_jpxd_state(); /* creates a gc object for our state, - defined in sjpx.h */ - --/* error reporting callback for the jpx library */ --static void --s_jpx_jas_error_cb(jas_error_t err, char *msg) --{ -- dprintf2("jasper (code %d) %s", (int)err, msg); --} -- -- - /* initialize the steam. - this involves allocating the stream and image structures, and - initializing the decoder. -@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss) - } - - status = jas_init(); -- jas_set_error_cb(s_jpx_jas_error_cb); - #ifdef JPX_DEBUG - /* raise the error reporting threshold from the default (0) */ - jas_setdbglevel(1); diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6fb517f35..cc408f55f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,5 +1,7 @@ -# Contributor: figue <ffigue at gmail> +# Maintainer: Figue <ffigue at gmail> +# Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contrubutor (Parabola): vando <facundo@esdebian.org> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> @@ -17,27 +19,27 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=3.6.15 -_pkgver=3.6 +pkgver=4.0 +_pkgver=4.0 pkgrel=1 -_xulver=1.9.2.15 +_xulver=2.0 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.gnu.org/software/gnuzilla/" license=('GPL2' 'MPL' 'LGPL') -depends=("xulrunner=$_xulver" 'desktop-file-utils' 'mime-types' 'shared-mime-info' 'libnotify') -makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'autoconf2.13') +depends=("xulrunner=${_xulver}" 'desktop-file-utils') +makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') provides=('firefox') conflicts=('firefox') -replaces=("firefox=$pkgver") +replaces=("firefox=${_pkgver}") install=icecat.install -source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz +#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2 mozconfig icecat.desktop icecat-safe.desktop mozilla-firefox-1.0-lang.patch xulrunner-copy-stub.patch - python2.7.patch # Search engines arch-linux-wiki.xml internet-archive.xml @@ -48,21 +50,20 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz duck-duck-go-ssl.xml duck-duck-go-lite.xml # Default options - firefox.js + firefox.js region.properties) build() { - cd "${srcdir}/${pkgname}-${pkgver}/" - ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR msg2 "Patching some files..." + cd "${srcdir}/${pkgname}-${_pkgver}/" patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch" - patch -Np0 -i "${srcdir}/python2.7.patch" - cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ msg2 "Starting build..." cp "${srcdir}/mozconfig" .mozconfig @@ -71,65 +72,42 @@ build() { export LDFLAGS="-Wl,-rpath,${ICECATDIR}" - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 + #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + ./configure + + touch config* + + make MOZ_MAKE_FLAGS="${MAKEFLAGS}" msg2 "Build complete" } package() { - cd "${srcdir}/${pkgname}-${pkgver}/" - ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR - make -j1 DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${_pkgver}/" + #make -j1 -f client.mk DESTDIR="${pkgdir}" install + make install DESTDIR="${pkgdir}" msg2 "Finishing..." - mv ${pkgdir}/usr/lib/${pkgname}-${pkgver} ${pkgdir}${ICECATDIR} - cd ${pkgdir}${ICECATDIR} - ln -s ${pkgname} firefox - ln -s ${pkgname}-bin firefox-bin - cd ${pkgdir}/usr/bin - ln -sf ${ICECATDIR}/icecat icecat - cd ${pkgdir}/usr/lib - ln -s ${ICECATDIR} icecat install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png || return 1 - install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ || return 1 - install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ || return 1 - - ##copy default prefs manually, icecat fails to start otherwise - cp -rf ${srcdir}/${pkgname}-${pkgver}/dist/bin/defaults/preferences ${pkgdir}${ICECATDIR}/defaults + install -m644 ${srcdir}/${pkgname}-${_pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png + install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ + install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ msg2 "Removing proprietary and anti-privacy search engines" - rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo}.xml - + rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml msg2 "And provide better ones..." + install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/ install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/ } -md5sums=('367ae51a84b290fff548721bf83bb8b4' - 'df304f6eb858922a0703bac7903aecc8' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - 'bd5db57c23c72a02a489592644f18995' - '5a1938673a367b20ecfa009a5eb767aa' - 'ab3dc9aecae7f08b9492fb3c00a5fd28' - '3403175087e584a8c5e840cc62310cd9' - '462c68585461f8cdc23c93c46f6ee4cf' - '2d492295c4308f9bba9ece28d8b3af2d' - '937ac0e5392b060d93bd33e761fbfa51' - 'cf97082e77e3ef5f1bd74b1db9329965' - '24528ca3f7f1e1a0ba735231aa3ac1de' - 'c5f00b6b24222aacd5a749d1f59c4d24' - 'e1bda0854de7d764f7401c81bb82b5ef' - 'eeac4b61ea403d18efa9597921741075' - 'f1c76e7e244257856a386ca2de69bdf0') -md5sums=('5ee4cd447cf51afb0539d958f6f13c97' - 'df304f6eb858922a0703bac7903aecc8' +md5sums=('6d7031ecdcf8edb214aaa3fbb1d3fe33' + '436db1f6167ffe82fcd71a53ffd80d0e' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' '5a1938673a367b20ecfa009a5eb767aa' - 'ab3dc9aecae7f08b9492fb3c00a5fd28' '3403175087e584a8c5e840cc62310cd9' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' @@ -138,5 +116,5 @@ md5sums=('5ee4cd447cf51afb0539d958f6f13c97' '24528ca3f7f1e1a0ba735231aa3ac1de' 'c5f00b6b24222aacd5a749d1f59c4d24' 'e1bda0854de7d764f7401c81bb82b5ef' - 'eeac4b61ea403d18efa9597921741075' + '9952048383966926eea6d67384102425' 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch new file mode 100644 index 000000000..85a8fb18d --- /dev/null +++ b/libre/icecat/firefox-version.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/installer/Makefile.in +--- mozilla-2.0.orig//browser/installer/Makefile.in 2011-03-03 14:11:20.000000000 -0800 ++++ mozilla-2.0/browser/installer/Makefile.in 2011-03-13 10:08:45.896702838 -0700 +@@ -43,6 +43,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="4.0" ++ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/libre/icecat/firefox.js b/libre/icecat/firefox.js index 945091b45..2300e65ce 100644 --- a/libre/icecat/firefox.js +++ b/libre/icecat/firefox.js @@ -52,30 +52,17 @@ pref("general.startup.browser", true); pref("browser.chromeURL","chrome://browser/content/"); pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); -pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); -pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul"); -pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul"); -pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); -pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); - -// Developers can set this to |true| if they are constantly changing files in their -// extensions directory so that the extension system does not constantly think that -// their extensions are being updated and thus reregistered every time the app is -// started. -pref("extensions.ignoreMTimeChanges", false); + // Enables some extra Extension System Logging (can reduce performance) pref("extensions.logging.enabled", false); -// Hides the install button in the add-ons mgr -pref("extensions.hideInstallButton", true); - -// Preferences for the Get Add-ons pane -pref("extensions.getAddons.showPane", false); -pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.maxResults", 5); -pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + +// Preferences for AMO integration +pref("extensions.getAddons.cache.enabled", true); +pref("extensions.getAddons.maxResults", 15); +pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); +pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); // Blocklist preferences pref("extensions.blocklist.enabled", true); @@ -83,9 +70,11 @@ pref("extensions.blocklist.interval", 86400); // Controls what level the blocklist switches from warning about items to forcibly // blocking them. pref("extensions.blocklist.level", 2); -pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); +pref("extensions.update.autoUpdateDefault", true); + // Dictionary download preference pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org"); @@ -99,13 +88,61 @@ pref("app.update.timer", 600000); // The interval to check for updates (app.update.interval) is defined in // firefox-branding.js +// Alternative windowtype for an application update user interface window. When +// a window with this windowtype is open the application update service won't +// open the normal application update user interface window. +pref("app.update.altwindowtype", "Browser:About"); + +// Enables some extra Application Update Logging (can reduce performance) +pref("app.update.log", false); + +// The number of general background check failures to allow before notifying the +// user of the failure. User initiated update checks always notify the user of +// the failure. +pref("app.update.backgroundMaxErrors", 10); + +// When |app.update.cert.requireBuiltIn| is true or not specified the +// final certificate and all certificates the connection is redirected to before +// the final certificate for the url specified in the |app.update.url| +// preference must be built-in. +pref("app.update.cert.requireBuiltIn", true); + +// When |app.update.cert.checkAttributes| is true or not specified the +// certificate attributes specified in the |app.update.certs.| preference branch +// are checked against the certificate for the url specified by the +// |app.update.url| preference. +pref("app.update.cert.checkAttributes", true); + +// The number of certificate attribute check failures to allow for background +// update checks before notifying the user of the failure. User initiated update +// checks always notify the user of the certificate attribute check failure. +pref("app.update.cert.maxErrors", 5); + +// The |app.update.certs.| preference branch contains branches that are +// sequentially numbered starting at 1 that contain attribute name / value +// pairs for the certificate used by the server that hosts the update xml file +// as specified in the |app.update.url| preference. When these preferences are +// present the following conditions apply for a successful update check: +// 1. the uri scheme must be https +// 2. the preference name must exist as an attribute name on the certificate and +// the value for the name must be the same as the value for the attribute name +// on the certificate. +// If these conditions aren't met it will be treated the same as when there is +// no update available. This validation will not be performed when using the +// |app.update.url.override| preference for update checking. +pref("app.update.certs.1.issuerName", "OU=Equifax Secure Certificate Authority,O=Equifax,C=US"); +pref("app.update.certs.1.commonName", "aus3.mozilla.org"); + +pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); +pref("app.update.certs.2.commonName", "aus3.mozilla.org"); + // Whether or not app updates are enabled -pref("app.update.enabled", true); +pref("app.update.enabled", false); // This preference turns on app.update.mode and allows automatic download and // install to take place. We use a separate boolean toggle for this to make // the UI easier to construct. -pref("app.update.auto", true); +pref("app.update.auto", false); // Defines how the Application Update Service notifies the user about updates: // @@ -114,7 +151,7 @@ pref("app.update.auto", true); // 1 download no prompt download no prompt if no incompatibilities // 2 download no prompt prompt // -// See chart in nsUpdateService.js.in for more details +// See chart in nsUpdateService.js source for more details // pref("app.update.mode", 1); @@ -122,7 +159,7 @@ pref("app.update.mode", 1); pref("app.update.silent", false); // Update service URL: -pref("app.update.url", "https://aus2.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); // app.update.url.manual is in branding section // app.update.url.details is in branding section @@ -180,12 +217,13 @@ pref("xpinstall.whitelist.add.36", "getpersonas.com"); pref("lightweightThemes.update.enabled", true); pref("keyword.enabled", true); -pref("keyword.URL", "chrome://browser-region/locale/region.properties"); +// Override the default keyword.URL. Empty value means +// "use the search service's default engine" +pref("keyword.URL", ""); pref("general.useragent.locale", "@AB_CD@"); pref("general.skins.selectedSkin", "classic/1.0"); pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@ (like Firefox/@APP_VERSION@)"); - pref("general.smoothScroll", false); #ifdef UNIX_BUT_NOT_MAC pref("general.autoScroll", false); @@ -200,15 +238,25 @@ pref("browser.shell.checkDefaultBrowser", true); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore pref("browser.startup.page", 1); -pref("browser.startup.homepage", "resource:/browserconfig.properties"); +pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); + +// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into +// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +// repackager of this code using an alternate snippet url, please keep your users safe +pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); +// browser.warnOnQuit == false will override all other possible prompts when quitting or restarting pref("browser.warnOnQuit", true); -pref("browser.warnOnRestart", true); +pref("browser.warnOnRestart", false); +// browser.showQuitWarning specifically controls the quit warning dialog. We +// might still show the window closing dialog with showQuitWarning == false. +pref("browser.showQuitWarning", false); pref("browser.fullscreen.autohide", true); pref("browser.fullscreen.animateUp", 1); +pref("browser.overlink-delay", 70); #ifdef UNIX_BUT_NOT_MAC pref("browser.urlbar.clickSelectsAll", false); @@ -241,6 +289,7 @@ pref("browser.urlbar.delay", 50); pref("browser.urlbar.restrict.history", "^"); pref("browser.urlbar.restrict.bookmark", "*"); pref("browser.urlbar.restrict.tag", "+"); +pref("browser.urlbar.restrict.openpage", "%"); pref("browser.urlbar.restrict.typed", "~"); pref("browser.urlbar.match.title", "#"); pref("browser.urlbar.match.url", "@"); @@ -248,7 +297,8 @@ pref("browser.urlbar.match.url", "@"); // The default behavior for the urlbar can be configured to use any combination // of the restrict or match filters with each additional filter restricting // more (intersection). Add the following values to set the behavior as the -// default: 1: history, 2: bookmark, 4: tag, 8: title, 16: url, 32: typed +// default: 1: history, 2: bookmark, 4: tag, 8: title, 16: url, 32: typed, +// 64: javascript, 128: tabs // E.g., 0 = show all results (no filtering), 1 = only visited pages in history, // 2 = only bookmarks, 3 = visited bookmarks, 1+16 = history matching in the url pref("browser.urlbar.default.behavior", 0); @@ -291,6 +341,7 @@ pref("browser.search.log", false); // Ordering of Search Engines in the Engine list. pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); +pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); // search bar results always open in a new tab pref("browser.search.openintab", false); @@ -302,7 +353,7 @@ pref("browser.search.update", true); pref("browser.search.update.log", false); // Check whether we need to perform engine updates every 6 hours -pref("browser.search.updateinterval", 6); +pref("browser.search.update.interval", 21600); // Whether or not microsummary and generator updates are enabled pref("browser.microsummary.enabled", true); @@ -311,16 +362,7 @@ pref("browser.microsummary.updateGenerators", true); // enable search suggestions by default pref("browser.search.suggest.enabled", true); -pref("browser.history.showSessions", false); pref("browser.sessionhistory.max_entries", 50); -#ifndef WINCE -pref("browser.history_expire_days", 180); -pref("browser.history_expire_days_min", 90); -#else -pref("browser.history_expire_days", 90); -pref("browser.history_expire_days_min", 45); -#endif -pref("browser.history_expire_sites", 40000); // handle links targeting new windows // 0=default window, 1=current window/tab, 2=new window, 3=new tab in most recent window @@ -343,13 +385,12 @@ pref("browser.tabs.warnOnClose", true); pref("browser.tabs.warnOnOpen", true); pref("browser.tabs.maxOpenBeforeWarn", 15); pref("browser.tabs.loadInBackground", true); -pref("browser.tabs.loadFolderAndReplace", true); pref("browser.tabs.opentabfor.middleclick", true); pref("browser.tabs.loadDivertedInBackground", false); pref("browser.tabs.loadBookmarksInBackground", false); -pref("browser.tabs.tabMinWidth", 100); -pref("browser.tabs.tabMaxWidth", 250); pref("browser.tabs.tabClipWidth", 140); +pref("browser.tabs.animate", true); +pref("browser.tabs.drawInTitlebar", true); // Where to show tab close buttons: // 0 on active tab only @@ -369,10 +410,6 @@ pref("browser.allTabs.previews", false); pref("browser.ctrlTab.previews", false); pref("browser.ctrlTab.recentlyUsedLimit", 7); -// Default bookmark sorting -pref("browser.bookmarks.sort.direction", "descending"); -pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name"); - // By default, do not export HTML at shutdown. // If true, at shutdown the bookmarks in your menu and toolbar will // be exported as HTML to the bookmarks.html file. @@ -382,15 +419,13 @@ pref("browser.bookmarks.autoExportHTML", false); // keep in {PROFILEDIR}/bookmarkbackups. Special values: // -1: unlimited // 0: no backups created (and deletes all existing backups) -pref("browser.bookmarks.max_backups", 5); +pref("browser.bookmarks.max_backups", 10); // Scripts & Windows prefs pref("dom.disable_open_during_load", true); -#ifdef DEBUG pref("javascript.options.showInConsole", true); +#ifdef DEBUG pref("general.warnOnAboutConfig", false); -#else -pref("javascript.options.showInConsole", false); #endif #ifdef WINCE @@ -398,14 +433,13 @@ pref("javascript.options.showInConsole", false); pref("dom.max_script_run_time", 20); #endif -// Make the status bar reliably present and unaffected by pages -pref("dom.disable_window_open_feature.status", true); // This is the pref to control the location bar, change this to true to -// force this instead of or in addition to the status bar - this makes -// the origin of popup windows more obvious to avoid spoofing. We would -// rather not do it by default because it affects UE for web applications, but -// without it there isn't a really good way to prevent chrome spoofing, see bug 337344 +// force this - this makes the origin of popup windows more obvious to avoid +// spoofing. We would rather not do it by default because it affects UE for web +// applications, but without it there isn't a really good way to prevent chrome +// spoofing, see bug 337344 pref("dom.disable_window_open_feature.location", true); +// prevent JS from setting status messages pref("dom.disable_window_status_change", true); // allow JS to move and resize existing windows pref("dom.disable_window_move_resize", false); @@ -415,7 +449,6 @@ pref("dom.disable_window_flip", true); // popups.policy 1=allow,2=reject pref("privacy.popups.policy", 1); pref("privacy.popups.usecustom", true); -pref("privacy.popups.firstTime", true); pref("privacy.popups.showBrowserMessage", true); pref("privacy.item.cookies", false); @@ -453,23 +486,6 @@ pref("privacy.sanitize.migrateFx3Prefs", false); pref("network.proxy.share_proxy_settings", false); // use the same proxy settings for all protocols -pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse - -// l12n and i18n -pref("intl.accept_languages", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties"); -pref("intl.charsetmenu.browser.unicode", "UTF-8, UTF-16LE, UTF-16BE, UTF-32, UTF-32LE, UTF-32BE"); -pref("intl.charset.detector", "chrome://global/locale/intl.properties"); -pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); -pref("font.language.group", "chrome://global/locale/intl.properties"); -pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); -pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties"); - // simple gestures support pref("browser.gesture.swipe.left", "Browser:BackOrBackDuplicate"); pref("browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate"); @@ -482,10 +498,10 @@ pref("browser.gesture.pinch.threshold", 150); pref("browser.gesture.pinch.latched", false); pref("browser.gesture.pinch.threshold", 25); #endif -pref("browser.gesture.pinch.out", "cmd_fullZoomEnlarge"); -pref("browser.gesture.pinch.in", "cmd_fullZoomReduce"); -pref("browser.gesture.pinch.out.shift", "cmd_fullZoomReset"); -pref("browser.gesture.pinch.in.shift", "cmd_fullZoomReset"); +pref("browser.gesture.pinch.out", ""); +pref("browser.gesture.pinch.in", ""); +pref("browser.gesture.pinch.out.shift", ""); +pref("browser.gesture.pinch.in.shift", ""); pref("browser.gesture.twist.latched", false); pref("browser.gesture.twist.threshold", 25); pref("browser.gesture.twist.right", ""); @@ -534,6 +550,9 @@ pref("alerts.totalOpenTime", 4000); pref("browser.xul.error_pages.enabled", true); pref("browser.xul.error_pages.expert_bad_cert", false); +// Work Offline is best manually managed by the user. +pref("network.manage-offline-status", false); + // We want to make sure mail URLs are handled externally... pref("network.protocol-handler.external.mailto", true); // for mail pref("network.protocol-handler.external.news", true); // for news @@ -567,9 +586,6 @@ pref("accessibility.typeaheadfind.timeout", 5000); pref("accessibility.typeaheadfind.linksonly", false); pref("accessibility.typeaheadfind.flashBar", 1); -// Disable the default plugin for firefox -pref("plugin.default_plugin_disabled", true); - // plugin finder service url pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); @@ -577,6 +593,10 @@ pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService. pref("plugins.hide_infobar_for_missing_plugin", false); pref("plugins.hide_infobar_for_outdated_plugin", false); +#ifdef XP_MACOSX +pref("plugins.hide_infobar_for_carbon_failure_plugin", false); +#endif + pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/"); pref("plugins.update.notifyUser", false); @@ -705,7 +725,6 @@ pref("browser.safebrowsing.dataProvider", 0); // Does the provider name need to be localizable? pref("browser.safebrowsing.provider.0.name", "Google"); -pref("browser.safebrowsing.provider.0.lookupURL", "http://safebrowsing.clients.google.com/safebrowsing/lookup?sourceid=firefox-antiphish&features=TrustRank&client={moz:client}&appver={moz:version}&"); pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2"); pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2"); @@ -772,13 +791,15 @@ pref("browser.sessionstore.resume_from_crash", true); pref("browser.sessionstore.resume_session_once", false); // minimal interval between two save operations in milliseconds -pref("browser.sessionstore.interval", 10000); +pref("browser.sessionstore.interval", 15000); // maximum amount of POSTDATA to be saved in bytes per history entry (-1 = all of it) // (NB: POSTDATA will be saved either entirely or not at all) pref("browser.sessionstore.postdata", 0); // on which sites to save text data, POSTDATA and cookies // 0 = everywhere, 1 = unencrypted sites, 2 = nowhere -pref("browser.sessionstore.privacy_level", 1); +pref("browser.sessionstore.privacy_level", 0); +// the same as browser.sessionstore.privacy_level, but for saving deferred session data +pref("browser.sessionstore.privacy_level_deferred", 1); // how many tabs can be reopened (per window) pref("browser.sessionstore.max_tabs_undo", 10); // how many windows can be reopened (per session) - on non-OS X platforms this @@ -787,10 +808,25 @@ pref("browser.sessionstore.max_windows_undo", 3); // number of crashes that can occur before the about:sessionrestore page is displayed // (this pref has no effect if more than 6 hours have passed since the last crash) pref("browser.sessionstore.max_resumed_crashes", 1); +// The number of tabs that can restore concurrently: +// < 0 = All tabs can restore at the same time +// 0 = Only the selected tab in each window will be restored +// Other tabs won't be restored until they are selected +// N = The number of tabs to restore at the same time +pref("browser.sessionstore.max_concurrent_tabs", 3); // allow META refresh by default pref("accessibility.blockautorefresh", false); +// Whether history is enabled or not. +pref("places.history.enabled", true); + +// The percentage of system memory that the Places database can use. Out of the +// allowed cache size it will at most use the size of the database file. +// Changes to this value are effective after an application restart. +// Acceptable values are between 0 and 50. +pref("places.database.cache_to_memory_percentage", 6); + // the (maximum) number of the recent visits to sample // when calculating frecency pref("places.frecency.numVisits", 10); @@ -810,6 +846,7 @@ pref("places.frecency.defaultBucketWeight", 10); // bonus (in percent) for visit transition types for frecency calculations pref("places.frecency.embedVisitBonus", 0); +pref("places.frecency.framedLinkVisitBonus", 0); pref("places.frecency.linkVisitBonus", 100); pref("places.frecency.typedVisitBonus", 2000); pref("places.frecency.bookmarkVisitBonus", 75); @@ -847,9 +884,6 @@ pref("browser.zoom.siteSpecific", true); // Whether or not to update background tabs to the current zoom level. pref("browser.zoom.updateBackgroundTabs", true); -// replace newlines with spaces when pasting into <input type="text"> fields -pref("editor.singleLine.pasteNewlines", 2); - // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/"); @@ -871,6 +905,7 @@ pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); // base url for the wifi geolocation network provider pref("geo.wifi.uri", "http://geomena.org"); +pref("geo.wifi.protocol", 0); #ifdef WINCE @@ -887,6 +922,8 @@ pref("browser.shell.checkDefaultBrowser", false); // disable bfcache for memory pref("browser.sessionhistory.max_total_viewers", 0); +pref("browser.sessionhistory.optimize_eviction", false); + // tweak default content sink prefs pref("content.sink.interactive_deflect_count", 10); /* default 0 */ pref("content.sink.perf_deflect_count", 50); /* default 200 */ @@ -910,10 +947,126 @@ pref("toolbar.customization.usesheet", true); pref("toolbar.customization.usesheet", false); #endif +// The default for this pref reflects whether the build is capable of IPC. +// (Turning it on in a no-IPC build will have no effect.) +#ifdef XP_MACOSX +// i386 ipc preferences +pref("dom.ipc.plugins.enabled.i386", false); +pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true); +pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true); +// x86_64 ipc preferences +pref("dom.ipc.plugins.enabled.x86_64", true); +#elifdef MOZ_IPC +pref("dom.ipc.plugins.enabled", true); +#else +pref("dom.ipc.plugins.enabled", false); +#endif + #ifdef XP_WIN #ifndef WINCE pref("browser.taskbar.previews.enable", false); pref("browser.taskbar.previews.max", 20); -pref("browser.taskbar.previews.cachetime", 20); +pref("browser.taskbar.previews.cachetime", 5); +pref("browser.taskbar.lists.enabled", true); +pref("browser.taskbar.lists.frequent.enabled", true); +pref("browser.taskbar.lists.recent.enabled", false); +pref("browser.taskbar.lists.maxListItemCount", 7); +pref("browser.taskbar.lists.tasks.enabled", true); +pref("browser.taskbar.lists.refreshInSeconds", 120); #endif #endif + +#ifdef MOZ_SERVICES_SYNC +// The sync engines to use. +pref("services.sync.registerEngines", "Bookmarks,Form,History,Password,Prefs,Tab"); +// Preferences to be synced by default +pref("services.sync.prefs.sync.accessibility.blockautorefresh", true); +pref("services.sync.prefs.sync.accessibility.browsewithcaret", true); +pref("services.sync.prefs.sync.accessibility.typeaheadfind", true); +pref("services.sync.prefs.sync.accessibility.typeaheadfind.linksonly", true); +pref("services.sync.prefs.sync.app.update.mode", true); +pref("services.sync.prefs.sync.browser.download.manager.closeWhenDone", true); +pref("services.sync.prefs.sync.browser.download.manager.retention", true); +pref("services.sync.prefs.sync.browser.download.manager.scanWhenDone", true); +pref("services.sync.prefs.sync.browser.download.manager.showWhenStarting", true); +pref("services.sync.prefs.sync.browser.formfill.enable", true); +pref("services.sync.prefs.sync.browser.link.open_newwindow", true); +pref("services.sync.prefs.sync.browser.offline-apps.notify", true); +pref("services.sync.prefs.sync.browser.safebrowsing.enabled", true); +pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true); +pref("services.sync.prefs.sync.browser.search.selectedEngine", true); +pref("services.sync.prefs.sync.browser.search.update", true); +pref("services.sync.prefs.sync.browser.startup.homepage", true); +pref("services.sync.prefs.sync.browser.startup.page", true); +pref("services.sync.prefs.sync.browser.tabs.autoHide", true); +pref("services.sync.prefs.sync.browser.tabs.closeButtons", true); +pref("services.sync.prefs.sync.browser.tabs.loadInBackground", true); +pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true); +pref("services.sync.prefs.sync.browser.tabs.warnOnOpen", true); +pref("services.sync.prefs.sync.browser.urlbar.autocomplete.enabled", true); +pref("services.sync.prefs.sync.browser.urlbar.autoFill", true); +pref("services.sync.prefs.sync.browser.urlbar.default.behavior", true); +pref("services.sync.prefs.sync.browser.urlbar.maxRichResults", true); +pref("services.sync.prefs.sync.dom.disable_open_during_load", true); +pref("services.sync.prefs.sync.dom.disable_window_flip", true); +pref("services.sync.prefs.sync.dom.disable_window_move_resize", true); +pref("services.sync.prefs.sync.dom.event.contextmenu.enabled", true); +pref("services.sync.prefs.sync.extensions.personas.current", true); +pref("services.sync.prefs.sync.extensions.update.enabled", true); +pref("services.sync.prefs.sync.general.smoothScroll", true); +pref("services.sync.prefs.sync.intl.accept_languages", true); +pref("services.sync.prefs.sync.javascript.enabled", true); +pref("services.sync.prefs.sync.layout.spellcheckDefault", true); +pref("services.sync.prefs.sync.lightweightThemes.isThemeSelected", true); +pref("services.sync.prefs.sync.lightweightThemes.usedThemes", true); +pref("services.sync.prefs.sync.network.cookie.cookieBehavior", true); +pref("services.sync.prefs.sync.network.cookie.lifetimePolicy", true); +pref("services.sync.prefs.sync.permissions.default.image", true); +pref("services.sync.prefs.sync.pref.advanced.images.disable_button.view_image", true); +pref("services.sync.prefs.sync.pref.advanced.javascript.disable_button.advanced", true); +pref("services.sync.prefs.sync.pref.downloads.disable_button.edit_actions", true); +pref("services.sync.prefs.sync.pref.privacy.disable_button.cookie_exceptions", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.cache", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.cookies", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.downloads", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.formdata", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.history", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.offlineApps", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.passwords", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true); +pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true); +pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true); +pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true); +pref("services.sync.prefs.sync.security.OCSP.disable_button.managecrl", true); +pref("services.sync.prefs.sync.security.OCSP.enabled", true); +pref("services.sync.prefs.sync.security.OCSP.require", true); +pref("services.sync.prefs.sync.security.default_personal_cert", true); +pref("services.sync.prefs.sync.security.enable_ssl3", true); +pref("services.sync.prefs.sync.security.enable_tls", true); +pref("services.sync.prefs.sync.security.warn_entering_secure", true); +pref("services.sync.prefs.sync.security.warn_entering_weak", true); +pref("services.sync.prefs.sync.security.warn_leaving_secure", true); +pref("services.sync.prefs.sync.security.warn_submit_insecure", true); +pref("services.sync.prefs.sync.security.warn_viewing_mixed", true); +pref("services.sync.prefs.sync.signon.rememberSignons", true); +pref("services.sync.prefs.sync.spellchecker.dictionary", true); +pref("services.sync.prefs.sync.xpinstall.whitelist.required", true); +#endif + +// Disable the error console and inspector +pref("devtools.errorconsole.enabled", false); +pref("devtools.inspector.enabled", false); + +// The last Web Console height. This is initially 0 which means that the Web +// Console will use the default height next time it shows. +// Change to -1 if you do not want the Web Console to remember its last height. +pref("devtools.hud.height", 0); + +// Whether the character encoding menu is under the main Firefox button. This +// preference is a string so that localizers can alter it. +pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties"); + +// Allow using tab-modal prompts when possible. +pref("prompts.tab_modal.enabled", true); +// Whether the Panorama should animate going in/out of tabs +pref("browser.panorama.animate_zoom", true); diff --git a/libre/icecat/icecat-safe.desktop b/libre/icecat/icecat-safe.desktop index 87acc970c..87acc970c 100755..100644 --- a/libre/icecat/icecat-safe.desktop +++ b/libre/icecat/icecat-safe.desktop diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop index 8a7cad93d..8a7cad93d 100755..100644 --- a/libre/icecat/icecat.desktop +++ b/libre/icecat/icecat.desktop diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install index b6bc9abe1..cefb71c4d 100755..100644 --- a/libre/icecat/icecat.install +++ b/libre/icecat/icecat.install @@ -2,8 +2,6 @@ post_install () { echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session" echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/icecat-3.6.* directories" - echo -e " >>> rm -rf /usr/lib/icecat-3.6.*" - echo -e " >>> IceCat now use /usr/lib/icecat-3.6 directory to keep clean the libdir \n" update-desktop-database -q } diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 2304cd402..0162c51ac 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -1,35 +1,64 @@ . $topsrcdir/browser/config/mozconfig +ac_add_options --disable-official-branding ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-cairo ac_add_options --with-pthreads -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --disable-installer -ac_add_options --enable-xinerama + ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-xprint -ac_add_options --enable-strip +ac_add_options --enable-optimize="-pipe -O3" +ac_add_options --disable-safe-browsing +ac_add_options --enable-extensions=default +ac_add_options --enable-startup-notification ac_add_options --enable-pango -ac_add_options --enable-system-cairo +ac_add_options --enable-strip ac_add_options --enable-svg ac_add_options --enable-canvas -ac_add_options --enable-startup-notification +ac_add_options --enable-smil +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-shared-js +ac_add_options --enable-url-classifier + +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-xterm-updates +ac_add_options --enable-printing +ac_add_options --enable-xinerama ac_add_options --enable-libxul -ac_add_options --disable-crashreporter -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2 -ac_add_options --disable-safe-browsing +ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0 ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +ac_add_options --disable-javaxpcom +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-xprint +ac_add_options --disable-mochitest +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-pedantic + +ac_add_options --enable-gio +ac_add_options --disable-gnomevfs +ac_add_options --enable-gconf +ac_add_options --enable-libnotify export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -export USE_SHORT_LIBNAME=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options USE_SHORT_LIBNAME=1 diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch index b42bd76c8..b42bd76c8 100755..100644 --- a/libre/icecat/xulrunner-copy-stub.patch +++ b/libre/icecat/xulrunner-copy-stub.patch diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 1703e2073..a253ae483 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 _preset=kernel26-lts.preset -pkgver=${_basekernel}.33 +pkgver=${_basekernel}.36 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -19,12 +19,7 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg # standard config files for mkinitcpio ramdisk ${_preset} ${pkgname}.install) -md5sums=('ad33db040de641a00c60726531192413' - '30851deee235a7486bd408cbe8eb2d71' - '8061d2986b33c052153edebaee435b8f' - 'aa1feef81f058ab623ef5aeac40af00d' - '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a') +options=(!strip) build() { cd ${srcdir}/linux-$pkgver @@ -220,8 +215,24 @@ package_kernel26-libre-lts-headers() { chown -R root.root ${pkgdir}/usr/src/linux-${_kernver} find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \; - + # strip scripts directory + find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip $STRIP_SHARED "$binary";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip $STRIP_STATIC "$binary";; + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } +md5sums=('44f553d98efbab305ec490334560b097' + '30851deee235a7486bd408cbe8eb2d71' + 'c0bd6a068a32636e52bf4d887bb2b722' + 'a5a3af2b95f9a8b3c43d1a74fa5fd82c' + '2cbfeb3e2a18d45f82f613e97fc23355' + 'fbfc7a1af3208c7b729055d91e1c149a') diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 index ada856765..d2bba6bee 100644 --- a/libre/kernel26-libre-lts/config.i686 +++ b/libre/kernel26-libre-lts/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Mar 15 11:13:21 2011 +# Fri Feb 18 17:22:19 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2371,7 +2371,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 30893ae2c..494bb3eff 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Mar 15 09:09:23 2011 +# Mon Mar 21 12:20:44 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -292,7 +292,8 @@ CONFIG_DMI=y CONFIG_GART_IOMMU=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_API=y @@ -2249,7 +2250,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m diff --git a/libre-testing/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 3c45cc49e..47f7aa9bb 100644 --- a/libre-testing/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgbase="kernel26-libre" pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel + _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.38 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -252,15 +252,9 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('21911d61ac22d66e71697a3d5ae092ba' - '35512d97c980ad876f5ab09f0f2488bc' - '23254a165ff9ee68f1f9d7a28d1c5318' - '8839a83dc7f3b90056691efbd67438d1' - '25584700a0a679542929c4bed31433b6' - '1bff12f1ba69206b1abee2bba4b7619c') -md5sums=('343617f67979845d9320b890437af930' - '95528a6936c31baf71ccb799f7914356' - '8f709c91e3ed2f9808e7cef4cbd8150b' - '38e5d9db7fecbb60433d8ca443829bd6' +md5sums=('be3d43e110130d1081d444ce1cc02a72' + '73d295e41ce6969e49b226058f24ab07' + '894b125c751fdab56d6b021a598a3362' + '3a17465b512ed9148040cef7b8a7f2c7' '25584700a0a679542929c4bed31433b6' '1bff12f1ba69206b1abee2bba4b7619c') diff --git a/libre-testing/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 541db489e..0c1b80cb8 100644 --- a/libre-testing/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.38 Kernel Configuration -# Thu Mar 24 10:43:26 2011 +# Wed Mar 30 07:00:21 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/libre-testing/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index 83184b9ef..62dea6af1 100644 --- a/libre-testing/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.38 Kernel Configuration -# Thu Mar 24 10:23:04 2011 +# Wed Mar 30 08:32:36 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/libre-testing/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs index 624ea1048..624ea1048 100755 --- a/libre-testing/kernel26-libre/get_configs +++ b/libre/kernel26-libre/get_configs diff --git a/libre-testing/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install index 1292f1f3b..1292f1f3b 100644 --- a/libre-testing/kernel26-libre/kernel26.install +++ b/libre/kernel26-libre/kernel26.install diff --git a/libre-testing/kernel26-libre/kernel26.preset b/libre/kernel26-libre/kernel26.preset index 742a44239..742a44239 100644 --- a/libre-testing/kernel26-libre/kernel26.preset +++ b/libre/kernel26-libre/kernel26.preset diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 108b6548c..59eee7f1b 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -50,9 +50,10 @@ package() { install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/ install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ install -m755 ${_gitname}/mipsrelease ${pkgdir}/usr/bin install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin - + }
\ No newline at end of file diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 2d988c976..61c96f190 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -4,21 +4,24 @@ # Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net> pkgname=mplayer-libre -pkgver=32792 +pkgver=33159 pkgrel=1 pkgdesc="A movie player for linux. Libre version without faac." arch=('i686' 'x86_64') depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' - 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau>=0.4' - 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex') + 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau' + 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex' 'fribidi' 'desktop-file-utils') license=('GPL') url="http://www.mplayerhq.hu/" -makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') +makedepends=('unzip' 'mesa' 'live-media' 'yasm' 'git') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png) provides=("mplayer=$pkgver") conflicts=('mplayer') replaces=("mplayer=$pkgver") +md5sums=('caedcdc1e50b5575c38c2a85f9c53afc' + '647b9f4ab5284a7fef3f84f992214e77' + 'd00874ccc644b7f43d6ef1c942fcef28') build() { # Custom CFLAGS break the mplayer build @@ -33,7 +36,6 @@ build() { --disable-liblzo \ --enable-speex \ --disable-openal \ - --disable-fribidi \ --disable-libdv \ --disable-musepack \ --disable-esd \ @@ -55,6 +57,3 @@ build() { install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png } -md5sums=('a48845de4b410ab7799ee87a038dd58e' - 'c0d6ef795cf6de48e3b87ff7c23f0319' - 'd00874ccc644b7f43d6ef1c942fcef28') diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop index 07acea13f..e3229d042 100644 --- a/libre/mplayer-libre/mplayer.desktop +++ b/libre/mplayer-libre/mplayer.desktop @@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器 Comment[pl]=Odtwarzaj filmy i muzykę Icon=mplayer TryExec=mplayer -Exec=mplayer %F +Exec=mplayer -really-quiet %F Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/libre/mplayer-libre/mplayer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 82b38d6a8..2f1028119 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -5,9 +5,9 @@ # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=mplayer-vaapi-libre -pkgver=32825 +pkgver=33025 _vaapi_version=20110127 -pkgrel=1 +pkgrel=3 pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support" arch=('i686' 'x86_64') url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/" @@ -16,7 +16,7 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'speex' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' - 'libvpx' 'libpulse' 'libva') + 'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils') makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') provides=("mplayer-vaapi=$pkgver") conflicts=('mplayer' 'mplayer-vaapi') @@ -25,7 +25,14 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2 mplayer.desktop - mplayer.png) + mplayer.png + patch-fixes.patch) +install=mplayer-vaapi.install +md5sums=('3814e5c47458de4bf0878d3996820341' + 'b39bd73ae8241dcb21dd1a8fa5eb87eb' + '647b9f4ab5284a7fef3f84f992214e77' + 'd00874ccc644b7f43d6ef1c942fcef28' + '9f96a03dddbea8be5ff2fa3925311d04') build() { cd "$srcdir/mplayer-$pkgver" @@ -33,6 +40,10 @@ build() { # Custom CFLAGS break the mplayer build unset CFLAGS LDFLAGS + # Update vaapi patches for changes introduced in mplayer/ffmpeg + patch -d "$srcdir/mplayer-vaapi-$_vaapi_version" -p1 -i \ + "$srcdir/patch-fixes.patch" + for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch" done @@ -43,8 +54,8 @@ build() { --disable-gui \ --disable-arts \ --disable-liblzo \ + --enable-speex \ --disable-openal \ - --disable-fribidi \ --disable-libdv \ --disable-musepack \ --disable-esd \ @@ -69,7 +80,3 @@ build() { } # vim:set ts=2 sw=2 et: -md5sums=('997a869feaa2fa3376407ee344fa280e' - 'b39bd73ae8241dcb21dd1a8fa5eb87eb' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28') diff --git a/libre/mplayer-vaapi-libre/mplayer-vaapi.install b/libre/mplayer-vaapi-libre/mplayer-vaapi.install new file mode 100644 index 000000000..2f38769cb --- /dev/null +++ b/libre/mplayer-vaapi-libre/mplayer-vaapi.install @@ -0,0 +1,9 @@ +post_install() { + update-desktop-database -q +} +post_upgrade() { + post_install $1 +} +post_remove() { + post_install $1 +} diff --git a/libre/mplayer-vaapi-libre/patch-fixes.patch b/libre/mplayer-vaapi-libre/patch-fixes.patch new file mode 100644 index 000000000..73153b3fe --- /dev/null +++ b/libre/mplayer-vaapi-libre/patch-fixes.patch @@ -0,0 +1,131 @@ +diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch mplayer-vaapi-20110127/patches/mplayer-vaapi.patch +--- mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch 2011-01-27 17:15:29.000000000 +0200 ++++ mplayer-vaapi-20110127/patches/mplayer-vaapi.patch 2011-03-05 06:47:20.000000000 +0200 +@@ -449,14 +449,15 @@ diff --git a/fmt-conversion.c b/fmt-conv + index 9e88100..bd32ce8 100644 + --- a/fmt-conversion.c + +++ b/fmt-conversion.c +-@@ -18,12 +18,14 @@ ++@@ -18,6 +18,7 @@ + + #include "mp_msg.h" + #include "libavutil/avutil.h" + +#include "libavcodec/avcodec.h" + #include "libmpcodecs/img_format.h" +- #include "fmt-conversion.h" +- ++ #include "libavutil/samplefmt.h" ++ #include "libaf/af_format.h" ++@@ -26,6 +27,7 @@ + static const struct { + int fmt; + enum PixelFormat pix_fmt; +@@ -503,14 +504,15 @@ diff --git a/fmt-conversion.h b/fmt-conv + index 9e133a8..962ca4e 100644 + --- a/fmt-conversion.h + +++ b/fmt-conversion.h +-@@ -23,6 +23,6 @@ +- #include "libavutil/avutil.h" ++@@ -24,7 +24,7 @@ ++ #include "libavutil/samplefmt.h" + + enum PixelFormat imgfmt2pixfmt(int fmt); + -int pixfmt2imgfmt(enum PixelFormat pix_fmt); + +int pixfmt2imgfmt(enum PixelFormat pix_fmt, int codec_id); ++ enum AVSampleFormat affmt2samplefmt(int fmt); ++ int samplefmt2affmt(enum AVSampleFormat sample_fmt); + +- #endif /* MPLAYER_FMT_CONVERSION_H */ + diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c + index 4f7ffb2..0da5434 100644 + --- a/gui/mplayer/gtk/opts.c +diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-20110127/patches/mplayer-vdpau.patch +--- mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch 2010-11-15 08:41:19.000000000 +0200 ++++ mplayer-vaapi-20110127/patches/mplayer-vdpau.patch 2011-03-05 07:07:15.000000000 +0200 +@@ -133,7 +133,7 @@ index b0d00f4..745d3e4 100644 + + videocodec ffh264 + info "FFmpeg H.264" +-@@ -993,19 +947,8 @@ videocodec ffh264 ++@@ -993,21 +947,8 @@ videocodec ffh264 + driver ffmpeg + dll h264 + out VAAPI_H264 +@@ -146,6 +146,8 @@ index b0d00f4..745d3e4 100644 + - fourcc X264,x264 + - fourcc avc1,AVC1 + - fourcc davc,DAVC ++- fourcc ai55,ai15 ; flip4mac avc intra ++- fourcc ai1q,ai5q ; flip4mac avc intra + - format 0x10000005 + - driver ffmpeg + - dll h264_vdpau +@@ -362,13 +364,13 @@ index f99f7ea..faafa97 100644 + context_count++; + } + break; +-@@ -3408,20 +3392,3 @@ AVCodec h264_decoder = { ++@@ -3408,21 +3392,3 @@ AVCodec h264_decoder = { + .flush= flush_dpb, + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + }; + - + -#if CONFIG_H264_VDPAU_DECODER +--AVCodec h264_vdpau_decoder = { ++-AVCodec ff_h264_vdpau_decoder = { + - "h264_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_H264, +@@ -381,6 +383,7 @@ index f99f7ea..faafa97 100644 + - .flush= flush_dpb, + - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), + - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE}, ++- .profiles = NULL_IF_CONFIG_SMALL(profiles), + -}; + -#endif + diff --git a/ffmpeg/libavcodec/mpeg12.c b/ffmpeg/libavcodec/mpeg12.c +@@ -458,7 +461,7 @@ index 6a331eb..c226797 100644 + #endif + - + -#if CONFIG_MPEG_VDPAU_DECODER +--AVCodec mpeg_vdpau_decoder = { ++-AVCodec ff_mpeg_vdpau_decoder = { + - "mpegvideo_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_MPEG2VIDEO, +@@ -474,7 +477,7 @@ index 6a331eb..c226797 100644 + -#endif + - + -#if CONFIG_MPEG1_VDPAU_DECODER +--AVCodec mpeg1_vdpau_decoder = { ++-AVCodec ff_mpeg1_vdpau_decoder = { + - "mpeg1video_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_MPEG1VIDEO, +@@ -500,7 +503,7 @@ index b339f78..1928d03 100644 + - + - + -#if CONFIG_MPEG4_VDPAU_DECODER +--AVCodec mpeg4_vdpau_decoder = { ++-AVCodec ff_mpeg4_vdpau_decoder = { + - "mpeg4_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_MPEG4, +@@ -588,7 +591,7 @@ index c9a547b..71c50e7 100644 + #endif + - + -#if CONFIG_WMV3_VDPAU_DECODER +--AVCodec wmv3_vdpau_decoder = { ++-AVCodec ff_wmv3_vdpau_decoder = { + - "wmv3_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_WMV3, +@@ -605,7 +608,7 @@ index c9a547b..71c50e7 100644 + -#endif + - + -#if CONFIG_VC1_VDPAU_DECODER +--AVCodec vc1_vdpau_decoder = { ++-AVCodec ff_vc1_vdpau_decoder = { + - "vc1_vdpau", + - AVMEDIA_TYPE_VIDEO, + - CODEC_ID_VC1, diff --git a/libre/poppler-libre/PKGBUILD b/libre/poppler-libre/PKGBUILD deleted file mode 100644 index d30bc73d2..000000000 --- a/libre/poppler-libre/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler-libre -_pkgbase=poppler -pkgname=('poppler-libre' 'poppler-glib' 'poppler-qt') -pkgver=0.16.2 -pkgrel=2 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms') -options=('!libtool') -url="http://poppler.freedesktop.org/" -source=(http://poppler.freedesktop.org/${_pkgbase}-${pkgver}.tar.gz) -md5sums=('0e68e4a894a4234d5468560bcd79baa9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-cairo-output \ - --enable-xpdf-headers \ - --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ - --enable-poppler-glib - make -} - -package_poppler-libre() { - pkgdesc="PDF rendering library based on xpdf 3.0 without unfree poppler-data" - depends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'lcms') - conflicts=("poppler-qt3<${pkgver}" 'poppler') - provides=("poppler=$pkgver") - replaces=('poppler') - - cd "${srcdir}/${_pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/include/poppler/{glib,qt4} - rm -f "${pkgdir}"/usr/lib/libpoppler-{glib,qt4}.so* - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc - rm -rf "${pkgdir}/usr/share/gtk-doc" - rm -f "${pkgdir}"/usr/bin/poppler-glib-demo -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'gtk2') - - cd "${srcdir}/${_pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${_pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} - -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') - - cd "${srcdir}/${_pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${_pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD new file mode 100644 index 000000000..ef2de693e --- /dev/null +++ b/libre/thunderbird-libre/rePKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Joshua Haase <hahj87@gmail.com> +_pkgbase=thunderbird +pkgname=thunderbird-libre +_pkgver=3.1 +pkgver=3.1.9 +_pkgrel=2 +pkgrel=$_pkgrel.1 +pkgdesc="Standalone Mail/News reader, with GNUZilla addons" +arch=('i686' 'x86_64') +license=('MPL' 'GPL') +url="http://www.mozilla.org/projects/thunderbird" +depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils') +makedepends=() +optdepends=('libcanberra: for sound support') +replaces=('thunderbird') +conflicts=('thunderbird') +provides=("thunderbird=$pkgver") +install=thunderbird.install +source=(http://mirrors.kernel.org/archlinux/extra/os/$CARCH/$_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz + gnuzilla-addons.patch) + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} $_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz + pushd usr/lib/${_pkgbase}-${_pkgver}/defaults/pref/ >/dev/null + patch -Np0 -i "${srcdir}/gnuzilla-addons.patch" + popd >/dev/null + rm "${srcdir}/gnuzilla-addons.patch" +} + +package() { + cp -a ./* ${pkgdir} +} diff --git a/social/bitcoin-daemon/rc.bitcoind b/social/bitcoin-daemon/rc.bitcoind index 98d713ffd..98d713ffd 100755..100644 --- a/social/bitcoin-daemon/rc.bitcoind +++ b/social/bitcoin-daemon/rc.bitcoind diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD new file mode 100644 index 000000000..75e8dc1ae --- /dev/null +++ b/social/inadyn-opendns/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Bug <Bug2000@gmail.com> +# Maintainer: Bug <Bug2000@gmail.com> +pkgname=inadyn-opendns +pkgver=1.99 +pkgrel=3 +pkgdesc="Simple dynamic DNS client with SSL support" +arch=('i686') +url="http://www.opendns.com/account/dynamic_dns/downloads" +license=('GPL') +makedepends=('unzip') +depends=('curl') +conflicts=('inadyn') +provides=('inadyn') +backup=('etc/inadyn.conf') +install=('inadyn-opendns.install') +source=("http://www.opendns.com/support/ddns_files/inadyn.source.v$pkgver.zip" + 'inadyn.rc-script') +md5sums=('0f2cf9c3ea3482c03e1c42f8480f1c55' + '73c61f9939546c28119242a1e12ffcff') + +build() { + cd "$srcdir/inadyn.source.v$pkgver" + + make || return 1 + + install -Dm755 bin/linux/inadyn $pkgdir/usr/sbin/inadyn + install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8 + install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5 + install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html + install -Dm755 $srcdir/inadyn.rc-script $pkgdir/etc/rc.d/inadyn + install -Dm644 inadyn.conf $pkgdir/etc/inadyn.conf +} diff --git a/social/inadyn-opendns/inadyn-opendns.install b/social/inadyn-opendns/inadyn-opendns.install new file mode 100644 index 000000000..e1a842430 --- /dev/null +++ b/social/inadyn-opendns/inadyn-opendns.install @@ -0,0 +1,17 @@ +post_install() { +/bin/true +echo Please remember to change the /etc/inadyn.conf file for your settings. +} + +post_upgrade() { +/bin/true +} + +pre_remove() { +/bin/true +} + +op=$1 +shift + +$op "$@"
\ No newline at end of file diff --git a/social/inadyn-opendns/inadyn.rc-script b/social/inadyn-opendns/inadyn.rc-script new file mode 100644 index 000000000..2ee29d59e --- /dev/null +++ b/social/inadyn-opendns/inadyn.rc-script @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/inadyn` +case "$1" in + start) + stat_busy "Starting INADYN Daemon" + [ -z "$PID" ] && /usr/sbin/inadyn --background --input_file /etc/inadyn.conf >>/var/log/inadyn 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/inadyn` + echo $PID >/var/run/inadyn.pid + add_daemon inadyn + stat_done + fi + ;; + stop) + stat_busy "Stopping INADYN Daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon inadyn + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD new file mode 100644 index 000000000..e3428763c --- /dev/null +++ b/social/liblockfile/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=liblockfile +pkgver=1.08_4 +pkgrel=1 +pkgdesc="a library with NFS-safe locking functions" +arch=('i686' 'x86_64') +license=('GPL') +url="http://packages.debian.org/unstable/libs/liblockfile1" +depends=('glibc') +makedepends=() +source=(http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_1.08.orig.tar.gz + http://ftp.debian.org/debian/pool/main/libl/$pkgname/${pkgname}_${pkgver/_/-}.debian.tar.bz2) + +build() { + cd $startdir/src/$pkgname-1.08 + + for p in `cat ../debian/patches/series` ; do + patch -p1 < ../debian/patches/$p + done + + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + + mkdir -p $startdir/pkg/usr/{lib,bin,include,share/man/man1,share/man/man3} + make install prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man || return 1 +} + +md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e' + '50c0c049d2838704f5720f5fd9eaddac') diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD index 3fced1597..57d833952 100644 --- a/social/lockfile-progs/PKGBUILD +++ b/social/lockfile-progs/PKGBUILD @@ -8,7 +8,7 @@ arch=('i686' 'x86_64') license=('GPL') url="http://packages.debian.org/unstable/misc/lockfile-progs" depends=('glibc') -makedepends=('gcc' 'make' 'liblockfile') +makedepends=('liblockfile') source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz) build() { diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD index 33c1bcf1b..c804b8409 100644 --- a/social/monkeysphere/PKGBUILD +++ b/social/monkeysphere/PKGBUILD @@ -12,6 +12,7 @@ license=('GPL3') depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) install=monkeysphere.install +md5sums=('481ac14c9fdef0ccd1944c593bd4f517') build() { cd "$srcdir/$pkgname-$pkgver" @@ -19,5 +20,3 @@ build() { make DESTDIR="$pkgdir/" install mkdir -p $pkgdir/var/lib/monkeysphere } -md5sums=() -md5sums=('481ac14c9fdef0ccd1944c593bd4f517') |