From 1e03953258ab135d1ac91b830753ef41f070f6c6 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 10 May 2011 14:39:14 -0300 Subject: kernel26-libre-2.6.38.6-1 --- libre/kernel26-libre/PKGBUILD | 14 +++++++------- libre/kernel26-libre/config.i686 | 5 +++-- libre/kernel26-libre/config.x86_64 | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index d891a2c46..223145716 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.38 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -21,6 +21,12 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/li # standard config files for mkinitcpio ramdisk kernel26.preset kernel26.install) +md5sums=('a1765e44f7835a27d29790ed4be58ee7' + 'c04fef76ddfc8942d50d42b229020ac8' + 'a93edb3877da53a09a73104a35e7006b' + 'f5995bd55f29a93e0216b0ec391b0fca' + '25584700a0a679542929c4bed31433b6' + '2d68b4cf4caedd1f0188f4877eca1d43') build() { cd ${srcdir}/linux-$pkgver @@ -241,9 +247,3 @@ 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=('53f12d40086282b858531e583fa02107' - '3753b5f0b812bd548aca6abafb0e6520' - 'a6b673aead69b12f50b8ca53d1f14b14' - 'fa7d6abea1e2163b1ab2b1acfe117f51' - '25584700a0a679542929c4bed31433b6' - '2d68b4cf4caedd1f0188f4877eca1d43') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 2269fd1d3..1b4bd0608 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -234,7 +234,7 @@ CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y # # IO Schedulers @@ -5329,7 +5329,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index d89904aa7..f30cc2c10 100644 --- a/libre/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 -# Fri Apr 22 19:25:29 2011 +# Tue May 10 07:45:46 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -234,7 +234,7 @@ CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set -# CONFIG_BLK_DEV_THROTTLING is not set +CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLOCK_COMPAT=y # @@ -3662,7 +3662,7 @@ CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set @@ -5070,7 +5070,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_IOMMU_DEBUG is not set -- cgit v1.2.3-54-g00ecf From 924d91fc2ed138218250b797eef9ff53fbb3ed11 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Tue, 10 May 2011 18:01:17 -0500 Subject: Commiting libre package your-freedom-20110510-1 --- libre/your-freedom/PKGBUILD | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 26df281b6..83f9070fc 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Parabola Project pkgname=your-freedom -pkgver=$(LC_ALL=C date +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') @@ -8,25 +8,18 @@ url="http://parabolagnulinux.org" license=('GPL') groups=('base') install=${pkgname}.install -source=(http://repo.parabolagnulinux.org/docs/blacklist.txt - http://repo.parabolagnulinux.org/docs/whitelist.txt) +source=() +md5sums=() noextract=() -md5sums=() #generate with 'makepkg -g' - -get_blacklist() { - unfree=($(wget -q -O - ${source[0]} | \ - cut -d':' -f1,2 | \ - sed "s/:$//" | \ - grep -v ":" | \ - sort -u)) - echo "conflicts=(${unfree[@]})" -} build() { - install -d $pkgdir/usr/share/doc/${pkgname} - install -m644 $srcdir/{black,white}list.txt + cd ${srcdir} + wget http://repo.parabolagnulinux.org/docs/blacklist.txt + wget http://repo.parabolagnulinux.org/docs/whitelist.txt + install -d ${pkgdir}/usr/share/doc/${pkgname} + install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/ } -md5sums=('2637ca96bd9e39dacd452bec01307345' - '98d40d324ed474a9b2a222432fb97f02') -conflicts=(abyssws aqua-data-studio arch-artwork arch-firefox-search archlinux-artwork archlinux-menus archlinux-themes-kde archlinux-themes-kdm archlinux-themes-slim archlinux-wallpaper arch-wiki-docs b43-fwcutter bass blobwars boinc boinc-nox chromium-bsu crafty d4x dina-font dosemu faac firefox-i18n firefox-spell-pt-br firefox-spell-ru flashplugin fmodex font-mathematica foomatic-db-nonfree gstreamer0.10-bad ipw2100-fw ipw2200-fw iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode java-sun jdk jre kernel26-firmware lha lib32-libflashsupport lib32-nvidia-utils libflashsupport linux-firmware mac martian martian-utils mesa-demos mod_fastcgi monaco-linux-font ndiswrapper ndiswrapper-utils netperf nouveau-firmware nvidia nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils nvidia-cg-toolkit nvidia-lts nvidia-utils nxclient openttd-opensfx opera povray profont pypy qingy-theme-arch qstat rt2870usb-fw rt2x00-rt61-fw rt2x00-rt71w-fw sdlmame sfarkxtc skype skype-oss skype-staticqt slim-themes snes9x sopcast sqlite3-doc tarsnap ttf-hannom ttf-ms-fonts urbanterror urbanterror-data vbaexpress virtualbox-additions virtualbox-additions-modules visualboyadvance warsow-data xdm-archlinux xf86-input-vmmouse xf86-video-vmware xorg-xlsfonts xpdf-chinese-simplified xpdf-chinese-traditional xpdf-japanese xpdf-korean xsnow xv zd1211-firmware) +package() { + conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt)) +} -- cgit v1.2.3-54-g00ecf From 4a407daabadf0899aae92cbe9008c41bb0d10f31 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Tue, 10 May 2011 18:03:43 -0500 Subject: Commiting libre package libretools-20110510-1 --- libre/libretools/PKGBUILD | 6 ++++-- libre/libretools/libretools.install | 22 +++------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index a0d3f1497..29e055afe 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libretools pkgver=$(date -u +%Y%m%d) -pkgrel=1.1 +pkgrel=1 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') url="http://parabolagnulinux.org" @@ -35,6 +35,7 @@ build() { package() { install -d ${pkgdir}/usr/bin + install -d ${pkgdir}/usr/sbin install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ @@ -47,7 +48,6 @@ package() { install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ - 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 @@ -56,5 +56,7 @@ package() { install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ } \ No newline at end of file diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 2657f5208..8eea37689 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -2,25 +2,8 @@ # arg 1: the new package version post_install() { cat < Date: Tue, 10 May 2011 18:05:00 -0500 Subject: Commiting libre package unarchiver-2.7-2 --- libre/unarchiver/PKGBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index eacbfdbb4..dcab9e342 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cedric Girard pkgname=unarchiver pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" @@ -12,18 +12,20 @@ source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41') replaces=('unrar') conflicts=('unrar') +provides=('unrar') build() { cd "$srcdir/The Unarchiver/XADMaster" . /usr/share/GNUstep/Makefiles/GNUstep.sh - make -f Makefile.linux + make -f Makefile.linux unar lsar } package() { cd "$srcdir/The Unarchiver/XADMaster" install -d "$pkgdir/usr/bin/" - cp unar lsar "$pkgdir/usr/bin/" + install -m755 unar ${pkgdir}/usr/bin + install -m755 lsar ${pkgdir}/usr/bin } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From dc91d5b659af923f365c333e56a26f44473e9ed9 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 11 May 2011 13:37:57 -0300 Subject: kernel26-libre-lts-2.6.32.40-1 --- libre/kernel26-libre-lts/PKGBUILD | 20 +++++------------ libre/kernel26-libre-lts/buildfix-gcc46.diff | 32 ++++++++++++++++++++++++++++ libre/kernel26-libre-lts/config | 17 ++++++++------- libre/kernel26-libre-lts/config.x86_64 | 5 +++-- 4 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 libre/kernel26-libre-lts/buildfix-gcc46.diff diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 55cde1f43..f3588dc77 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,30 +7,22 @@ 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}.39 +pkgver=${_basekernel}.40 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://linux-libre.fsfla.org" source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2 - libata-alignment.patch # the main kernel config files config.i686 config.x86_64 # standard config files for mkinitcpio ramdisk ${_preset} - ${pkgname}.install - buildfix-gcc46.diff) + ${pkgname}.install) options=(!strip) build() { cd ${srcdir}/linux-$pkgver - # fix 22343 udev crashes - patch -Np1 -i ${srcdir}/libata-alignment.patch - - # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1 - patch -Np1 -i ${srcdir}/buildfix-gcc46.diff - cat ../config.$CARCH >./.config if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config @@ -219,10 +211,8 @@ package_kernel26-libre-lts-headers() { # 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=('9502a2248b2024da4f30a5d52a90322d' - '30851deee235a7486bd408cbe8eb2d71' +md5sums=('eabd563bea84785dd74f3f694162ca69' '3298f542840c52a8b8abc1b3795e455b' - 'cd1a62e81eb9e910779f3eb18a6e28c6' + 'f0fcf2ca389e8997a88963d70153a479' '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a' - 'bb7410d7b740dfad0385a07b66e6621f') + 'fbfc7a1af3208c7b729055d91e1c149a') diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff new file mode 100644 index 000000000..595f97d66 --- /dev/null +++ b/libre/kernel26-libre-lts/buildfix-gcc46.diff @@ -0,0 +1,32 @@ +From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 +From: Greg Rose +Date: Tue, 16 Nov 2010 19:41:36 -0800 +Subject: [PATCH] Remove extra struct page member from the buffer info + structure + +declaration. + +Reported-by: Andi Kleen +Signed-off-by: Greg Rose +Tested-by: Emil Tantilov +Signed-off-by: Jeff Kirsher +--- + drivers/net/igbvf/igbvf.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h +index 63284e3..9d4d63e 100644 +--- a/drivers/net/igbvf/igbvf.h ++++ b/drivers/net/igbvf/igbvf.h +@@ -126,7 +126,6 @@ struct igbvf_buffer { + unsigned int page_offset; + }; + }; +- struct page *page; + }; + + union igbvf_desc { +-- +1.7.4.5 + + diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index d2bba6bee..fa7600cfb 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Fri Feb 18 17:22:19 2011 +# Mon Apr 18 12:31:05 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2308,9 +2308,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_TOUCHSCREEN_UCB1400=m CONFIG_TOUCHSCREEN_WM97XX=m -# CONFIG_TOUCHSCREEN_WM9705 is not set -# CONFIG_TOUCHSCREEN_WM9712 is not set -# CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y @@ -2324,10 +2324,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y CONFIG_TOUCHSCREEN_USB_GOTOP=y CONFIG_TOUCHSCREEN_USB_JASTEC=y -# CONFIG_TOUCHSCREEN_USB_E2I is not set +CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_PCAP is not set +CONFIG_TOUCHSCREEN_PCAP=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m @@ -4457,7 +4457,7 @@ CONFIG_DLM=m # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 @@ -4567,7 +4567,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set CONFIG_DOUBLEFAULT=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 30cc5aefa..b0aadff4e 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 -# Mon Apr 18 14:25:56 2011 +# Tue May 10 08:27:04 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4378,7 +4378,8 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set +CONFIG_DEBUG_RODATA=y +# CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set -- cgit v1.2.3-54-g00ecf From 228ffe5b950969849ae2e7e7612f8c6292fda765 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Thu, 12 May 2011 14:04:59 -0500 Subject: Commiting libre package libretools-20110512-1 --- libre/libretools/PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 29e055afe..7f859fa3f 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -42,7 +42,9 @@ package() { install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin + install -m755 ${_gitname}/aur ${pkgdir}/usr/bin install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ -- cgit v1.2.3-54-g00ecf From e91120338e0fe970b7df7efe1b011203599ce9b2 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 18 May 2011 18:06:25 -0300 Subject: initscripts-2011.05.2-1.1 --- libre/initscripts/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 0d7c0b367..63a7c1545 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2011.04.1 +pkgver=2011.05.2 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') @@ -13,19 +13,19 @@ url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'grep' 'coreutils' 'udev' +depends=('bash' 'grep' 'coreutils' 'udev>=167' 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') install=initscripts.install -source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" +source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') -md5sums=('9c9cca84f5601700f3f1d0303aa1e058' +md5sums=('f807b43a4dd43a6cf562f10651577ad2' '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} - DESTDIR=${pkgdir} ./install.sh + make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -- cgit v1.2.3-54-g00ecf From 4d7afdcfd397cd1f66ad1cf3b3a644834c5b0424 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 18 May 2011 18:06:54 -0300 Subject: pacman-3.5.2-1.1 repackaged to include [libre] by default --- libre/pacman/PKGBUILD | 71 +++++++++++++++++++++++++ libre/pacman/makepkg.conf | 114 ++++++++++++++++++++++++++++++++++++++++ libre/pacman/pacman.conf | 86 ++++++++++++++++++++++++++++++ libre/pacman/pacman.conf.x86_64 | 95 +++++++++++++++++++++++++++++++++ libre/pacman/pacman.install | 62 ++++++++++++++++++++++ libre/pacman/rePKGBUILD | 48 +++++++++++++++++ 6 files changed, 476 insertions(+) create mode 100644 libre/pacman/PKGBUILD create mode 100644 libre/pacman/makepkg.conf create mode 100644 libre/pacman/pacman.conf create mode 100644 libre/pacman/pacman.conf.x86_64 create mode 100644 libre/pacman/pacman.install create mode 100644 libre/pacman/rePKGBUILD diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD new file mode 100644 index 000000000..dfdc56f09 --- /dev/null +++ b/libre/pacman/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee + +pkgname=pacman +pkgver=3.5.2 +pkgrel=1.1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' + 'c7e6dbee04b7c492febea4366519b91d' + '8809642ed398d2b9b98c5974b8b5e348' + 'a8684989d3dfad5a6e1bcf95af3e571b') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install Arch specific stuff + mkdir -p $pkgdir/etc + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 " + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64 " + ;; + esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman + mkdir -p $pkgdir/usr/share/zsh/site-functions/ + install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} + +# vim: set ts=2 sw=2 et: diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf new file mode 100644 index 000000000..a655e935f --- /dev/null +++ b/libre/pacman/makepkg.conf @@ -0,0 +1,114 @@ +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'rsync::/usr/bin/rsync -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/curl + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Exclusive: will only run on @CARCH@ +# -march (or -mcpu) builds exclusively for an architecture +# -mtune optimizes for an architecture, but builds for whole processor family +CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) +# A negated environment option will do the opposite of the comments below. +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +# +BUILDENV=(fakeroot !distcc color !ccache check) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +# +OPTIONS=(strip docs libtool emptydirs zipman purge) + +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe " + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf new file mode 100644 index 000000000..675956d3d --- /dev/null +++ b/libre/pacman/pacman.conf @@ -0,0 +1,86 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 new file mode 100644 index 000000000..ed460dd8b --- /dev/null +++ b/libre/pacman/pacman.conf.x86_64 @@ -0,0 +1,95 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install new file mode 100644 index 000000000..0e598bb4b --- /dev/null +++ b/libre/pacman/pacman.install @@ -0,0 +1,62 @@ +#!/bin/sh +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" +} + +_resetbackups() { + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" + + # path variables + pacconf="/etc/pacman.conf" + dbpath="/var/lib/pacman/local" + + # get a list of NoUpgrade files from the user's pacman.conf + echo ">>> Retrieving pacman.conf NoUpgrade list..." + config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) + # add the standard list of files, even if they are already above + config="$config \ + etc/passwd etc/group etc/shadow etc/sudoers \ + etc/fstab etc/raidtab etc/ld.so.conf \ + etc/rc.conf etc/rc.local \ + etc/modprobe.conf etc/modules.conf \ + etc/lilo.conf boot/grub/menu.lst" + + # blank md5sum for use in sed expression + zeroes='00000000000000000000000000000000' + + for file in $config; do + echo ">>> -> finding owner of /$file..." + line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) + # if file is owned by a package, go find its incorrectly stored sum + if [ ! -z "$line" ]; then + # get the name and version of the package owning file + name=$(echo $line | awk '{print $5}') + version=$(echo $line | awk '{print $6}') + # set the path to the backup array holding the md5sum + path="$dbpath/$name-$version/files" + # run a sed on the path to reset the line containing $file + # NOTE: literal tab characters in sed expression after $file + echo ">>> -> resetting sum of /$file..." + sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path + else + echo ">>> -> $file is unowned." + fi + done +} diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD new file mode 100644 index 000000000..09e0f4b3e --- /dev/null +++ b/libre/pacman/rePKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee + +CARCH=x86_64 +pkgname=pacman +pkgver=3.5.2 +pkgrel=1.1 +_pkgrel=1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool !strip) +source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + +} + +package() { + cp -a ./* ${pkgdir} + rm $pkgdir/etc/pacman.conf + + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + ;; + esac +} + +# vim: set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf