From 3d9001e2cad4598e60676c3295beb2ef6182a2c5 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 2 Nov 2017 15:10:28 -0300 Subject: Remove some [pcr] packages --- pcr-testing/udisks2-elogind/PKGBUILD | 53 -- pcr-testing/udisks2-elogind/git-fixes.patch | 13 - .../udisks2-elogind/udisks-enable-elogind.patch | 67 -- pcr/alien/PKGBUILD | 36 - pcr/apt/PKGBUILD | 45 -- pcr/cadabra2/PKGBUILD | 35 - pcr/cadabra2/package.install | 11 - pcr/cadabra2/package.patch | 28 - pcr/debhelper/PKGBUILD | 30 - pcr/dpkg/PKGBUILD | 51 -- pcr/intltool-debian/PKGBUILD | 25 - pcr/po-debconf/ChangeLog | 11 - pcr/po-debconf/PKGBUILD | 28 - pcr/pseint/PKGBUILD | 41 -- pcr/rpm-org/PKGBUILD | 75 -- pcr/rpm-org/bfdfix.patch | 24 - pcr/rpm-org/rpmextract.sh | 6 - pcr/rpm-org/rpmlib-filesystem-check.patch | 125 ---- pcr/udisks2-elogind/PKGBUILD | 53 -- pcr/udisks2-elogind/git-fixes.patch | 777 --------------------- pcr/udisks2-elogind/udisks-enable-elogind.patch | 64 -- pcr/yum-metadata-parser/PKGBUILD | 25 - pcr/yum/PKGBUILD | 53 -- pcr/yum/remove-init-dir-makefile.patch | 12 - 24 files changed, 1688 deletions(-) delete mode 100644 pcr-testing/udisks2-elogind/PKGBUILD delete mode 100644 pcr-testing/udisks2-elogind/git-fixes.patch delete mode 100644 pcr-testing/udisks2-elogind/udisks-enable-elogind.patch delete mode 100644 pcr/alien/PKGBUILD delete mode 100644 pcr/apt/PKGBUILD delete mode 100644 pcr/cadabra2/PKGBUILD delete mode 100644 pcr/cadabra2/package.install delete mode 100644 pcr/cadabra2/package.patch delete mode 100644 pcr/debhelper/PKGBUILD delete mode 100644 pcr/dpkg/PKGBUILD delete mode 100644 pcr/intltool-debian/PKGBUILD delete mode 100644 pcr/po-debconf/ChangeLog delete mode 100644 pcr/po-debconf/PKGBUILD delete mode 100644 pcr/pseint/PKGBUILD delete mode 100644 pcr/rpm-org/PKGBUILD delete mode 100644 pcr/rpm-org/bfdfix.patch delete mode 100644 pcr/rpm-org/rpmextract.sh delete mode 100644 pcr/rpm-org/rpmlib-filesystem-check.patch delete mode 100644 pcr/udisks2-elogind/PKGBUILD delete mode 100644 pcr/udisks2-elogind/git-fixes.patch delete mode 100644 pcr/udisks2-elogind/udisks-enable-elogind.patch delete mode 100644 pcr/yum-metadata-parser/PKGBUILD delete mode 100644 pcr/yum/PKGBUILD delete mode 100644 pcr/yum/remove-init-dir-makefile.patch diff --git a/pcr-testing/udisks2-elogind/PKGBUILD b/pcr-testing/udisks2-elogind/PKGBUILD deleted file mode 100644 index 058b160a7..000000000 --- a/pcr-testing/udisks2-elogind/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: David P. -# Contributor: Alexey D. -# Contributor: Felix Yan -# Contributor: Ionut Biru - -pkgname=udisks2-elogind -pkgver=2.6.4 -pkgrel=1 -pkgdesc="Disk Management Service, version 2" -arch=('armv7h' 'i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL2') -depends=('glib2' 'polkit-elogind' 'libatasmart' 'libgudev' 'acl' 'eudev-systemd') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'gnome-common') -optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support' - 'ntfs-3g: NTFS filesystem management support' - 'dosfstools: VFAT filesystem management support') -provides=("udisks2=${pkgver}") -conflicts=('udisks2') -options=(libtool strip) -source=(https://github.com/storaged-project/udisks/releases/download/udisks-${pkgver}/udisks-${pkgver}.tar.bz2 - 'udisks-enable-elogind.patch') -sha256sums=('d65389a861a9a475d3c8e0ad2b8603d9961977f1a00024093b5bacd711e774f2' - '7d47a00ce6d484140a09939e08678b72d9a0212490d70a1d150b06b21b413ba9') - -prepare(){ - cd "udisks-$pkgver" - patch -Np 1 -i ${srcdir}/udisks-enable-elogind.patch - autoreconf -vfi -} - -build() { - cd "udisks-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib - make - - # fix mdadm location - sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ - "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules -} - -package() { - cd "udisks-$pkgver" - make DESTDIR="$pkgdir" install \ - bash_completiondir=/usr/share/bash-completion/completions -} diff --git a/pcr-testing/udisks2-elogind/git-fixes.patch b/pcr-testing/udisks2-elogind/git-fixes.patch deleted file mode 100644 index cdd1f1f2f..000000000 --- a/pcr-testing/udisks2-elogind/git-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/80-udisks2.rules udisks-2.6.4-lib/data/80-udisks2.rules ---- a/data/80-udisks2.rules 2017-02-14 18:38:41.000000000 -0500 -+++ b/data/80-udisks2.rules 2017-05-09 10:55:41.814085127 -0500 -@@ -93,6 +93,9 @@ - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*SanDisk*", ENV{ID_MODEL}=="*Cruzer*", ENV{ID_CDROM}!="1", ENV{ID_DRIVE_THUMB}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="HP", ENV{ID_MODEL}=="*v125w*", ENV{ID_DRIVE_THUMB}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="13fe", ENV{ID_MODEL}=="*Patriot*", ENV{ID_DRIVE_THUMB}="1" -+ -+# SD-Card reader in Chromebook Pixel -+SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05e3", ENV{ID_MODEL_ID}=="0727", ENV{ID_DRIVE_FLASH_SD}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*JetFlash*", ENV{ID_MODEL}=="*Transcend*", ENV{ID_DRIVE_THUMB}="1" - - # SD-Card reader in Chromebook Pixel diff --git a/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch b/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch deleted file mode 100644 index 2cf619258..000000000 --- a/pcr-testing/udisks2-elogind/udisks-enable-elogind.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/configure.ac 2017-02-14 18:38:41.000000000 -0500 -+++ b/configure.ac 2017-05-09 10:38:43.187459993 -0500 -@@ -170,6 +170,17 @@ - AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) - AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) - -+PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], -+ [have_libelogind=yes], -+ [have_libelogins=no]) -+AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes) -+if test "x$have_libelogind" = "xyes"; then -+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+fi -+AC_SUBST(HAVE_LIBELOGIND) -+AC_SUBST(LIBELOGIND_CFLAGS) -+AC_SUBST(LIBELOGIND_LIBS) -+ - # udevdir - AC_ARG_WITH([udevdir], - AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]), -@@ -600,6 +611,7 @@ - udevdir: ${udevdir} - systemdsystemunitdir: ${systemdsystemunitdir} - using libsystemd-login: ${have_libsystemd_login} -+ using libelogind: ${have_libelogind} - use /media for mounting: ${fhs_media} - acl support: ${have_acl} - libblockdev_part support: ${have_libblockdev_part} - ---- a/src/Makefile.am 2017-02-14 18:38:44.000000000 -0500 -+++ b/src/Makefile.am 2017-05-09 10:41:47.087452500 -0500 -@@ -100,6 +100,7 @@ - $(POLKIT_GOBJECT_1_CFLAGS) \ - $(ACL_CFLAGS) \ - $(LIBSYSTEMD_LOGIN_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(PART_CFLAGS) \ - $(NULL) - -@@ -112,6 +113,7 @@ - $(POLKIT_GOBJECT_1_LIBS) \ - $(ACL_LIBS) \ - $(LIBSYSTEMD_LOGIN_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(PART_LDFLAGS) \ - $(top_builddir)/udisks/libudisks2.la \ - $(NULL) - ---- a/src/udisksdaemonutil.c 2017-02-14 18:38:44.000000000 -0500 -+++ b/src/udisksdaemonutil.c 2017-05-09 10:43:26.650781771 -0500 -@@ -45,6 +45,16 @@ - #include - #include - -+#endif -+ -+#if defined(HAVE_ELOGIND) && !defined(HAVE_LIBSYSTEMD_LOGIN) -+#include -+/* re-use HAVE_LIBSYSTEMD_LOGIN to not clutter the source file */ -+#define HAVE_LIBSYSTEMD_LOGIN 1 -+#endif -+ -+#if defined(HAVE_LIBSYSTEMD_LOGIN) -+ - #define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0) - #endif - diff --git a/pcr/alien/PKGBUILD b/pcr/alien/PKGBUILD deleted file mode 100644 index e3bb70773..000000000 --- a/pcr/alien/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: David P. -# Contributor: Miguel Revilla - -pkgname=alien -pkgver=8.95 -pkgrel=2.parabola1 -pkgdesc="Program that converts between the rpm, dpkg, stampede slp, and slackware tgz file formats" -arch=('any') -url="http://joeyh.name/code/alien/" -license=('GPL2') -depends=('perl' 'debhelper' 'cpio' 'rpm-org' 'bzip2') -conflicts=('alien_package_converter') -makedepends=('perl') -options=('!emptydirs') -source=("http://ftp.de.debian.org/debian/pool/main/a/alien/alien_$pkgver.tar.xz") -sha256sums=('37a22587c33810feab323474bdadbf969fda2eb4e720b2ca01b40d82d6f71a17') - -build() { - cd "${srcdir}/alien-${pkgver}" - # Setting these env variables overwrites any command-line-options we don't want... - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=site DESTDIR='${pkgdir}'" \ - PERL_MB_OPT="--installdirs site --destdir '${pkgdir}'" \ - PERL5LIB="" PERL_LOCAL_LIB_ROOT="" \ - MODULEBUILDRC=/dev/null - - perl Makefile.PL - - make DESTDIR="${pkgdir}" PREFIX="${pkgdir}/usr" VARPREFIX="${pkgdir}" -} - -package() { - cd "${srcdir}/alien-${pkgver}" - make DESTDIR="${pkgdir}" PREFIX="${pkgdir}/usr" VARPREFIX="${pkgdir}" INSTALLSITELIB=/usr/lib/perl5/site_perl INSTALLVENDORLIB=/usr/lib/perl5/vendor_perl install - mv "${pkgdir}"/usr/bin/site_perl/alien "${pkgdir}"/usr/bin -} diff --git a/pcr/apt/PKGBUILD b/pcr/apt/PKGBUILD deleted file mode 100644 index 4dbab8f8b..000000000 --- a/pcr/apt/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: David P. -# Contributor: Michael DeGuzis -# Contributor: Mark Weiman -# Contributor: Johannes Dewender arch at JonnyJD dot net -# Contributor: Tony Lambiris - -pkgname=apt -pkgver=1.3.2 -pkgrel=3 -pkgdesc="Command-line package manager used on Debian-based systems" -arch=('armv7h' 'i686' 'x86_64') -url="http://packages.debian.org" -license=('GPL2') -depends=('gnupg' 'curl' 'xz') -makedepends=('cmake' 'dpkg' 'docbook-xsl' 'doxygen' 'po4a' 'gtest' 'w3m') -provides=('libapt-inst' 'libapt-pkg' 'libapt-pkg-dev' "apt-utils") -conflicts=(apt-git) -replaces=(apt-git) -source=("git+https://anonscm.debian.org/git/apt/apt.git#tag=${pkgver}") -sha256sums=('SKIP') - -build() { - cd "$srcdir/$pkgname" - - # docbook xsl is stored with the version on Arch - DOCBOOK_XSL_VER=`ls -d /usr/share/xml/docbook/xsl-stylesheets-* | xargs basename` - - cmake \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR="lib" \ - -DDOCBOOK_XSL="/usr/share/xml/docbook/${DOCBOOK_XSL_VER}" \ - . - - sed -i -e "s|stylesheet/docbook-xsl|$DOCBOOK_XSL_VER=t|" doc/*.xsl - sed -i -e "s|stylesheet/nwalsh|$DOCBOOK_XSL_VER=|" doc/*.xsl - - make -j $(nproc) all -} - -package() { - cd "$srcdir/$pkgname" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/cadabra2/PKGBUILD b/pcr/cadabra2/PKGBUILD deleted file mode 100644 index 394910098..000000000 --- a/pcr/cadabra2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: David P. -# Contributor: Tarn Burton - -pkgname='cadabra2' -pkgver=2.1.4 -pkgrel=1 -pkgdesc="A computer algebra system designed specifically for the solution of problems encountered in field theory." -arch=('i686' 'x86_64') -url="http://cadabra.science/" -license=('GPL') -conflicts=('cadabra2-git') -depends=('python-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs' 'python-sympy' 'texlive-core') -makedepends=('cmake' 'boost' 'git') -source=("$pkgname::git+https://github.com/kpeeters/cadabra2#tag=$pkgver" "package.patch") -md5sums=('SKIP' - '2cf414a7280fd64858d1d19d38d4bd8c') -install=package.install - -prepare() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i ../package.patch -} - -build() { - cd $pkgname - mkdir -p build - cd build - cmake -DCMAKE_SKIP_RPATH=true -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd "${pkgname}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/pcr/cadabra2/package.install b/pcr/cadabra2/package.install deleted file mode 100644 index bcc3dee5a..000000000 --- a/pcr/cadabra2/package.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - mktexlsr -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/pcr/cadabra2/package.patch b/pcr/cadabra2/package.patch deleted file mode 100644 index 63320f971..000000000 --- a/pcr/cadabra2/package.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -aur -bZwB -x .git cadabra2.old/frontend/CMakeLists.txt cadabra2/frontend/CMakeLists.txt ---- cadabra2.old/frontend/CMakeLists.txt 2017-01-29 09:40:31.904324635 -0500 -+++ cadabra2/frontend/CMakeLists.txt 2017-01-29 09:40:54.937598647 -0500 -@@ -25,8 +25,8 @@ - execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - # Get the last path in the LaTeX install dir, if there is more than one separated by a ':'. --#string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}") --#list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) -+string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}") -+list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) - set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2") - message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}") - install(DIRECTORY DESTINATION ${INSTALL_LATEX_DIR} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -diff -aur -bZwB -x .git cadabra2.old/tests/CMakeLists.txt cadabra2/tests/CMakeLists.txt ---- cadabra2.old/tests/CMakeLists.txt 2017-01-29 09:40:31.907657960 -0500 -+++ cadabra2/tests/CMakeLists.txt 2017-01-29 09:40:54.937598647 -0500 -@@ -37,8 +37,8 @@ - foreach(NBTEST ${NBTESTS}) - add_custom_command(OUTPUT ${CDBOUT}/${NBTEST}.cdb - DEPENDS ${CNBIN}/${NBTEST}.cnb ${DC} -- COMMAND cadabra2cadabra -- ARGS ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb -+ COMMAND env -+ ARGS LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/client_server ${CMAKE_BINARY_DIR}/client_server/cadabra2cadabra ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb - COMMENT "Creating ${NBTEST} notebook...") - add_custom_target("${NBTEST}_test" ALL echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb) - add_test(${NBTEST} ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb) diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD deleted file mode 100644 index 0fd9ed031..000000000 --- a/pcr/debhelper/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: David P. -# Contributor: Justin Vreeland -# Contributor: Antoine Lubineau -# Contributor: Charles Pigott -# Contributor: Andrei "Garoth" Thorp - -pkgname=debhelper -pkgver=10.2.5 -pkgrel=1 -pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks" -arch=('any') -url="http://anonscm.debian.org/cgit/debhelper/debhelper.git/" -license=('GPL2' 'GPL3') -depends=('binutils' 'dpkg>=1.16.2' 'file>=3.23' 'html2text' 'man-db>=2.5.1' 'perl>=5.6.0' 'po-debconf') -makedepends=('po4a>=0.24' 'man-db>=2.5.1' 'file>=3.23' 'git') -optdepends=('dh-make') -source=("git://anonscm.debian.org/debhelper/debhelper.git#tag=debian/$pkgver") -md5sums=('SKIP') - -build() { - cd "$srcdir/$pkgname" - make -} - -package() { - cd "$srcdir/$pkgname" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/dpkg/PKGBUILD b/pcr/dpkg/PKGBUILD deleted file mode 100644 index 785469769..000000000 --- a/pcr/dpkg/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: David P. -# Contributor: Alad Wenter -# Contributor: Jochen Schalanda -# Contributor: C. Dominik Bódi -# Contributor: Pierre Carrier -# Contributor: Thomas Dziedzic -# Contributor: Chris Giles -# Contributor: seblu -# Contributor: squiddo -# Contributor: dront78 -# Contributor: hugelgupf - -pkgname=dpkg -pkgver=1.18.23 -_commit=933f2d62873822eae68fc082f69b4a7c48802c28 # 1.18.23 -pkgrel=2 -pkgdesc="The Debian Package Manager. Don't use it instead of Arch's 'pacman'." -arch=('armv7h' 'i686' 'x86_64') -url="https://tracker.debian.org/pkg/dpkg" -license=('GPL') -depends=('xz' 'zlib' 'bzip2' 'perl') -makedepends=('perl-io-string' 'perl-timedate' 'git') -checkdepends=('perl-io-string' 'perl-test-pod') -source=("$pkgname-$pkgver::git+https://anonscm.debian.org/git/dpkg/dpkg.git#commit=$_commit") -sha256sums=('SKIP') - -check() { - cd "$pkgname-$pkgver" - #make check -} - -build() { - cd "$pkgname-$pkgver" - autoreconf -f -i - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --disable-start-stop-daemon \ - --disable-install-info - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/var/$pkgname"/updates/ - touch "${pkgdir}/var/lib/$pkgname"/{status,available} -} diff --git a/pcr/intltool-debian/PKGBUILD b/pcr/intltool-debian/PKGBUILD deleted file mode 100644 index 9c73d6be4..000000000 --- a/pcr/intltool-debian/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: David P. -# Contributor: Daniel Milde -# Contributor: Toni Foerster -# Contributor: André Klitzing - -pkgname=intltool-debian -pkgver=0.35.0 -pkgrel=5 -pkgdesc="The internationalization tool collection with RFC822 support" -arch=('armv7h' 'i686' 'x86_64') -url="http://www.debian.org/" -license=('GPL') -depends=('gettext' 'perl') -source=(ftp://ftp.debian.org/debian/pool/main/i/intltool-debian/${pkgname}_${pkgver}+20060710.1_all.deb) -sha256sums=('121b13900d598f737acd9461575e36d93eead49c61a95ab04273fb68e1ecc60a') - -build() { - cd ${srcdir} - tar -zxf data.tar.gz -} - -package() { - cd ${srcdir} - cp -r usr ${pkgdir} -} diff --git a/pcr/po-debconf/ChangeLog b/pcr/po-debconf/ChangeLog deleted file mode 100644 index 7b678c60d..000000000 --- a/pcr/po-debconf/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -2013-12-09 Matt Corallo - * Adopt package - * Add a packge() so makepkg shuts up about deprecated PKGBUILD - * Use sha256sum instead of md5 (just because I feel happier that way) - -2012-03-26 Stéphane Marguet (Stemp) - * Fix namcap warnings - * Create changelog - -2012-01-22 Stéphane Marguet (Stemp) - * Update to po-debconf_1.0.16+nmu2 diff --git a/pcr/po-debconf/PKGBUILD b/pcr/po-debconf/PKGBUILD deleted file mode 100644 index 1e34a8458..000000000 --- a/pcr/po-debconf/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: David P. -# Contributor: Giovanni 'ItachiSan' Santini -# Contributor: Matt Corallo -# Contributor: Stéphane Marguet (Stemp) -# Contributor: Toni Foerster -# Contributor: André Klitzing - -pkgname=po-debconf -pkgver=1.0.20 -pkgrel=2 -pkgdesc="Debian manage translated Debconf templates files with gettext" -arch=('any') -url="http://www.debian.org/" -license=('GPL') -changelog=ChangeLog -depends=('gettext' 'perl' 'intltool-debian') -source=(http://ftp.debian.org/debian/pool/main/p/po-debconf/${pkgname}_${pkgver}_all.deb) -sha256sums=('493dcfe155a49b97689403d440b9c953caabc89ccedc4d0297db675ec4db09a1') - -build() { - cd $srcdir - ar -x $srcdir/${pkgname}_${pkgver}_all.deb data.tar.xz - tar -xJf $srcdir/data.tar.xz -} - -package() { - cp -r $srcdir/usr/ $pkgdir -} diff --git a/pcr/pseint/PKGBUILD b/pcr/pseint/PKGBUILD deleted file mode 100644 index 159a9c934..000000000 --- a/pcr/pseint/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: David P. -# Autor: Pablo Novara - Zaskar -# Contributor: mncarbone - -pkgname=pseint -pkgver=20170313 -pkgrel=1 -pkgdesc="A tool for learning programming basis with a simple spanish pseudocode" -arch=('i686' 'x86_64') -url="http://pseint.sourceforge.net" -license=('GPL') -depends=('libpng12') -url='http://ufpr.dl.sourceforge.net/project' -source_x86_64=(http://prdownloads.sourceforge.net/pseint/pseint-l64-${pkgver}.tgz) -source_i686=(http://prdownloads.sourceforge.net/pseint/pseint-l32-${pkgver}.tgz) -md5sums_i686=('599fffec2bee56dd456ac2dbbf7241c6') -md5sums_x86_64=('fd7725ea18034261aa2df2dc15dd8b7c') - -package() { - mkdir -p "${pkgdir}/opt/${pkgname}" - cp -rv "${srcdir}/${pkgname}/"* "${pkgdir}/opt/${pkgname}" - mkdir -p "${pkgdir}/usr/share/applications/" - desktopfile="${pkgdir}/opt/${pkgname}/${pkgname}.desktop" - touch $desktopfile - echo "[Desktop Entry]" >> $desktopfile - echo "Type=Application" >> $desktopfile - echo "Name=PSeInt" >> $desktopfile - echo "Comment=${pkgdesc}" >> $desktopfile - echo "Comment[es]=Una herramienta para aprender las bases de la programación mediante pseudocodigo en español" >> $desktopfile - echo "Exec=${pkgname}" >> $desktopfile - echo "Icon=/opt/${pkgname}/imgs/icon.svg" >> $desktopfile - echo "Terminal=false" >> $desktopfile - echo "Categories=Development;IDE;" >> $desktopfile - mkdir -p "${pkgdir}/usr/share/applications/" - cp $desktopfile "${pkgdir}/usr/share/applications/" - mkdir -p "${pkgdir}/usr/bin/" - touch "${pkgdir}/usr/bin/${pkgname}" - echo "#!/usr/bin/env sh" >> "${pkgdir}/usr/bin/${pkgname}" - echo "/opt/${pkgname}/wxPSeInt" >> "${pkgdir}/usr/bin/${pkgname}" - chmod +x "${pkgdir}/usr/bin/${pkgname}" -} diff --git a/pcr/rpm-org/PKGBUILD b/pcr/rpm-org/PKGBUILD deleted file mode 100644 index 21eb13554..000000000 --- a/pcr/rpm-org/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Maintainer: David P. -# Contributor: Johannes Dewender arch at JonnyJD dot net -# Contributor: Konrad -# Contributor: Luka Perkov lukaperkov net> -# Contributor: Fernando M beford.net> -# Contributor: Wintershade - -pkgname=rpm-org -pkgver=4.13.0.1 -_pkgver=$pkgver -#_pkgver=4.12.0-rc1 -pkgrel=1 -pkgdesc="RPM Package Manager - RPM.org fork, used in major RPM distros" -arch=('armv7h' 'i686' 'x86_64') -url="http://www.rpm.org/" -license=('GPL2') -depends=('lua>=5.1' 'file' 'nss>=3.12' 'popt' 'elfutils' 'libarchive' 'libcap') -makedepends=('python2' 'python') -optdepends=('libdbus: systemd inhibit plugin') -conflicts=('rpm' 'rpmextract') -options=('!libtool') -provides=("rpm=${pkgver}" 'rpmextract=1.0-4') -#source=(https://github.com/rpm-software-management/rpm/releases/download/rpm-${pkgver}-release/rpm-${pkgver}.tar.bz2 -source=(http://ftp.rpm.org/releases/rpm-4.13.x/rpm-$pkgver.tar.bz2 - rpmextract.sh rpmlib-filesystem-check.patch bfdfix.patch) -sha1sums=('9566f95f38fcb214e439c552f378c2f64ba0aff9' - '74849919207885ae024f1ab8ed68a76474d67ad7' - '0c5fa516dde1f10211af896c729e4b00c313e12b' - '456d4a2c9f71c2e3bfa5011800855a73a55aa5bc') - -prepare() { - cd ${srcdir}/rpm-${_pkgver} - patch -p1 < ../rpmlib-filesystem-check.patch - patch -p1 < ../bfdfix.patch - } - - -build() { - cd ${srcdir}/rpm-${_pkgver} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-python \ - --with-external-db \ - --with-lua \ - --with-cap \ - CPPFLAGS="`pkg-config --cflags nss`" \ - PYTHON=python2 - make -} - -package() { - cd ${srcdir}/rpm-${_pkgver} - make prefix=${pkgdir}/usr localstatedir=${pkgdir}/var install - rmdir ${pkgdir}/var/tmp - rmdir ${pkgdir}/var - # rpmextract using bsdtar, needs libarchive - install -m755 ${srcdir}/rpmextract.sh ${pkgdir}/usr/bin/ - - # move rpm from /bin to /usr/bin - mv ${pkgdir}/bin/rpm ${pkgdir}/usr/bin/ - rm ${pkgdir}/usr/bin/rpm{query,verify} - cd ${pkgdir}/usr/bin - ln -s rpm rpmquery - ln -s rpm rpmverify - rm -r ${pkgdir}/bin/ - - # also install python 3 files - # building with python 3 files as default doesn't seem to work - cd ${srcdir}/rpm-${_pkgver} - cd python - python setup.py install --root="$pkgdir/" --optimize=1 -} diff --git a/pcr/rpm-org/bfdfix.patch b/pcr/rpm-org/bfdfix.patch deleted file mode 100644 index c3e7d69a3..000000000 --- a/pcr/rpm-org/bfdfix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c -index cd7fa02..03db7af 100644 ---- a/tools/sepdebugcrcfix.c -+++ b/tools/sepdebugcrcfix.c -@@ -28,7 +28,19 @@ - #include - #include - #include -+#ifndef PACKAGE -+#define PACKAGE -+#ifndef PACKAGE_VERSION -+#define PACKAGE_VERSION - #include -+#undef PACKAGE_VERSION -+#else -+#include -+#endif -+#undef PACKAGE -+#else -+#include -+#endif - - #define _(x) x - #define static_assert(expr) \ diff --git a/pcr/rpm-org/rpmextract.sh b/pcr/rpm-org/rpmextract.sh deleted file mode 100644 index f9d4e5b1e..000000000 --- a/pcr/rpm-org/rpmextract.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -if [ "$1" = "" -o ! -e "$1" ]; then - echo "no package supplied" 1>&2 - exit 1 -fi -bsdtar xf $1 diff --git a/pcr/rpm-org/rpmlib-filesystem-check.patch b/pcr/rpm-org/rpmlib-filesystem-check.patch deleted file mode 100644 index 984d8c4af..000000000 --- a/pcr/rpm-org/rpmlib-filesystem-check.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -up rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check rpm-4.10.90.git11978/lib/depends.c ---- rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check 2012-11-01 09:40:26.000000000 +0200 -+++ rpm-4.10.90.git11978/lib/depends.c 2012-11-05 10:53:42.294733695 +0200 -@@ -589,6 +589,109 @@ static int rpmdbProvides(rpmts ts, depCa - return rc; - } - -+/* -+ * Temporary support for live-conversion of the filesystem hierarchy -+ * mailto: kay@redhat.com, harald@redhat.com -+ * https://fedoraproject.org/wiki/Features/UsrMove -+ * -+ * X-CheckUnifiedSystemdir: -+ * /bin, /sbin, /lib, /lib64 --> /usr -+ * -+ * X-CheckUnifiedBindir: -+ * /usr/sbin -> /usr/bin -+ * -+ * X-CheckMultiArchLibdir: -+ * /usr/lib64 /usr/lib/ (e.g. x86_64-linux-gnu) -+ * -+ * This code is not needed for new installations, it can be removed after -+ * updates from older systems are no longer supported: Fedora 19 / RHEL 8. -+ */ -+ -+static int CheckLink(const char *dir, const char *root) -+{ -+ char *d = NULL; -+ struct stat sbuf; -+ int rc = 0; -+ -+ if (!root) -+ root = "/"; -+ -+ rasprintf(&d, "%s%s", root, dir); -+ if (!d) { -+ rc = -1; -+ goto exit; -+ } -+ -+ /* directory or symlink does not exist, all is fine */ -+ if (lstat(d, &sbuf) < 0) { -+ rc = 1; -+ goto exit; -+ } -+ -+ /* if it is a symlink, all is fine */ -+ if (S_ISLNK(sbuf.st_mode)) -+ rc = 1; -+ -+exit: -+ free(d); -+ return rc; -+} -+ -+static int CheckFilesystemHierarchy(rpmds * dsp, const char *root) -+{ -+ static const char *dirs[] = { "bin", "sbin", "lib", "lib64" }; -+ int check; -+ int i; -+ rpmds ds; -+ rpmstrPool pool = rpmdsPool(*dsp); -+ int rc = 0; -+ -+ for (i = 0; i < sizeof(dirs) / sizeof(dirs[0]); i++) { -+ check = CheckLink(dirs[i], root); -+ if (check < 0) { -+ rc = -1; -+ goto exit; -+ } -+ -+ if (check == 0) -+ goto exit; -+ } -+ ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, -+ "rpmlib(X-CheckUnifiedSystemdir)", "1", -+ RPMSENSE_EQUAL); -+ rpmdsMerge(dsp, ds); -+ rpmdsFree(ds); -+ -+ check = CheckLink("usr/lib64", root); -+ if (check < 0) { -+ rc = -1; -+ goto exit; -+ } -+ if (check > 0) { -+ ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, -+ "rpmlib(X-CheckMultiArchLibdir)", "1", -+ RPMSENSE_EQUAL); -+ rpmdsMerge(dsp, ds); -+ rpmdsFree(ds); -+ } -+ -+ check = CheckLink("usr/sbin", root); -+ if (check < 0) { -+ rc = -1; -+ goto exit; -+ } -+ if (check > 0) { -+ ds = rpmdsSinglePool(pool, RPMTAG_PROVIDENAME, -+ "rpmlib(X-CheckUnifiedBindir)", "1", -+ RPMSENSE_EQUAL); -+ rpmdsMerge(dsp, ds); -+ rpmdsFree(ds); -+ } -+ -+exit: -+ return rc; -+} -+ - /** - * Check dep for an unsatisfied dependency. - * @param ts transaction set -@@ -612,8 +715,10 @@ retry: - * Check those dependencies now. - */ - if (dsflags & RPMSENSE_RPMLIB) { -- if (tsmem->rpmlib == NULL) -+ if (tsmem->rpmlib == NULL) { - rpmdsRpmlibPool(rpmtsPool(ts), &(tsmem->rpmlib), NULL); -+ CheckFilesystemHierarchy(&(tsmem->rpmlib), rpmtsRootDir(ts)); -+ } - - if (tsmem->rpmlib != NULL && rpmdsSearch(tsmem->rpmlib, dep) >= 0) { - rpmdsNotify(dep, "(rpmlib provides)", rc); diff --git a/pcr/udisks2-elogind/PKGBUILD b/pcr/udisks2-elogind/PKGBUILD deleted file mode 100644 index dd2506b77..000000000 --- a/pcr/udisks2-elogind/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: David P. -# Contributor: Alexey D. -# Contributor: Felix Yan -# Contributor: Ionut Biru - -pkgname=udisks2-elogind -pkgver=2.6.4 -pkgrel=1 -pkgdesc="Disk Management Service, version 2" -arch=('armv7h' 'i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL2') -depends=('glib2' 'polkit-elogind' 'libatasmart' 'libgudev' 'acl' 'eudev-systemd') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2' 'gnome-common') -optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support' - 'ntfs-3g: NTFS filesystem management support' - 'dosfstools: VFAT filesystem management support') -provides=("udisks2=${pkgver}") -conflicts=('udisks2') -options=(libtool strip) -source=(https://github.com/storaged-project/udisks/releases/download/udisks-${pkgver}/udisks-${pkgver}.tar.bz2 - 'udisks-enable-elogind.patch') -sha256sums=('d65389a861a9a475d3c8e0ad2b8603d9961977f1a00024093b5bacd711e774f2' - '52e9157cdf2a1ecc02664205491c9015951213309d08fe18a32f62f54ed93095') - -prepare(){ - cd "udisks-$pkgver" - patch -Np 1 -i ${srcdir}/udisks-enable-elogind.patch - autoreconf -vfi -} - -build() { - cd "udisks-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib - make - - # fix mdadm location - sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ - "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules -} - -package() { - cd "udisks-$pkgver" - make DESTDIR="$pkgdir" install \ - bash_completiondir=/usr/share/bash-completion/completions -} diff --git a/pcr/udisks2-elogind/git-fixes.patch b/pcr/udisks2-elogind/git-fixes.patch deleted file mode 100644 index 43cc53b05..000000000 --- a/pcr/udisks2-elogind/git-fixes.patch +++ /dev/null @@ -1,777 +0,0 @@ -diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules -index ed093ee..7112db8 100644 ---- a/data/80-udisks2.rules -+++ b/data/80-udisks2.rules -@@ -94,6 +94,9 @@ SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="*SanDisk*", ENV{ID_MODEL}=="*Cruzer*", ENV{I - SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="HP", ENV{ID_MODEL}=="*v125w*", ENV{ID_DRIVE_THUMB}="1" - SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="13fe", ENV{ID_MODEL}=="*Patriot*", ENV{ID_DRIVE_THUMB}="1" - -+# SD-Card reader in Chromebook Pixel -+SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05e3", ENV{ID_MODEL_ID}=="0727", ENV{ID_DRIVE_FLASH_SD}="1" -+ - # ------------------------------------------------------------------------ - # ------------------------------------------------------------------------ - # ------------------------------------------------------------------------ -diff --git a/doc/man/udisksctl.xml b/doc/man/udisksctl.xml -index 8f38479..434a8fb 100644 ---- a/doc/man/udisksctl.xml -+++ b/doc/man/udisksctl.xml -@@ -104,6 +104,16 @@ - - - udisksctl -+ power-off -+ -+ --object-path OBJECT -+ --block-device DEVICE -+ -+ --no-user-interaction -+ -+ -+ -+ udisksctl - smart-simulate - --file PATH - -@@ -238,6 +248,31 @@ - - - -+ -+ -+ -+ Arranges for the drive to be safely removed and powered -+ off. On the OS side this includes ensuring that no process -+ is using the drive, then requesting that in-flight buffers -+ and caches are committed to stable storage. The exact -+ steps for powering off the drive depends on the drive -+ itself and the interconnect used. For drives connected -+ through USB, the effect is that the USB device will be -+ deconfigured followed by disabling the upstream hub port -+ it is connected to. -+ -+ -+ Note that as some physical devices contain multiple drives -+ (for example 4-in-1 flash card reader USB devices) -+ powering off one drive may affect other drives. As such -+ there are not a lot of guarantees associated with -+ performing this action. Usually the effect is that the -+ drive disappears as if it was unplugged. -+ -+ -+ -+ -+ - - - -diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c -index 574bf2c..a588580 100644 ---- a/src/udisksdaemonutil.c -+++ b/src/udisksdaemonutil.c -@@ -830,7 +830,7 @@ udisks_daemon_util_get_caller_uid_sync (UDisksDaemon *daemon, - { - struct passwd pwstruct; - gchar pwbuf[8192]; -- static struct passwd *pw; -+ struct passwd *pw = NULL; - int rc; - - rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw); -@@ -840,6 +840,7 @@ udisks_daemon_util_get_caller_uid_sync (UDisksDaemon *daemon, - UDISKS_ERROR, - UDISKS_ERROR_FAILED, - "User with uid %d does not exist", (gint) uid); -+ goto out; - } - else if (pw == NULL) - { -diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c -index d619850..22bcfd0 100644 ---- a/src/udiskslinuxblock.c -+++ b/src/udiskslinuxblock.c -@@ -804,12 +804,23 @@ udisks_linux_block_update (UDisksLinuxBlock *block, - gchar *dm_name_dev_file = NULL; - const gchar *dm_name_dev_file_as_symlink = NULL; - -+ const gchar *dm_vg_name; -+ const gchar *dm_lv_name; -+ gchar *dm_lvm_dev_file = NULL; -+ - dm_name = g_udev_device_get_property (device->udev_device, "DM_NAME"); - if (dm_name != NULL) - dm_name_dev_file = g_strdup_printf ("/dev/mapper/%s", dm_name); -+ -+ dm_vg_name = g_udev_device_get_property (device->udev_device, "DM_VG_NAME"); -+ dm_lv_name = g_udev_device_get_property (device->udev_device, "DM_LV_NAME"); -+ if (dm_vg_name != NULL && dm_lv_name != NULL) -+ dm_lvm_dev_file = g_strdup_printf ("/dev/%s/%s", dm_vg_name, dm_lv_name); -+ - for (n = 0; symlinks != NULL && symlinks[n] != NULL; n++) - { -- if (g_str_has_prefix (symlinks[n], "/dev/vg_")) -+ if (g_str_has_prefix (symlinks[n], "/dev/vg_") -+ || g_strcmp0 (symlinks[n], dm_lvm_dev_file) == 0) - { - /* LVM2 */ - preferred_device_file = symlinks[n]; -@@ -824,6 +835,7 @@ udisks_linux_block_update (UDisksLinuxBlock *block, - if (preferred_device_file == NULL && dm_name_dev_file_as_symlink != NULL) - preferred_device_file = dm_name_dev_file_as_symlink; - g_free (dm_name_dev_file); -+ g_free (dm_lvm_dev_file); - } - else if (g_str_has_prefix (device_file, "/dev/md")) - { -diff --git a/src/udiskslinuxdevice.c b/src/udiskslinuxdevice.c -index 0b65a69..8c4a3ed 100644 ---- a/src/udiskslinuxdevice.c -+++ b/src/udiskslinuxdevice.c -@@ -199,6 +199,7 @@ probe_ata (UDisksLinuxDevice *device, - { - /* ATA8: 7.16 IDENTIFY DEVICE - ECh, PIO Data-In */ - input.command = 0xec; -+ input.count = 1; - output.buffer = g_new0 (guchar, 512); - output.buffer_size = 512; - if (!udisks_ata_send_command_sync (fd, -@@ -221,6 +222,7 @@ probe_ata (UDisksLinuxDevice *device, - { - /* ATA8: 7.17 IDENTIFY PACKET DEVICE - A1h, PIO Data-In */ - input.command = 0xa1; -+ input.count = 1; - output.buffer = g_new0 (guchar, 512); - output.buffer_size = 512; - if (!udisks_ata_send_command_sync (fd, -diff --git a/src/udiskslinuxdrive.c b/src/udiskslinuxdrive.c -index 170ba27..ed541ff 100644 ---- a/src/udiskslinuxdrive.c -+++ b/src/udiskslinuxdrive.c -@@ -25,6 +25,12 @@ - #include - #include - #include -+#include -+#include -+#include -+#include -+#include -+#include - - #include - #include -@@ -1192,6 +1198,122 @@ handle_set_configuration (UDisksDrive *_drive, - - /* ---------------------------------------------------------------------------------------------------- */ - -+/* TODO: move to udisksscsi.[ch] similar what we do for ATA with udisksata.[ch] */ -+ -+static gboolean -+send_scsi_command_sync (gint fd, -+ guint8 *cdb, -+ gsize cdb_len, -+ GError **error) -+{ -+ struct sg_io_v4 io_v4; -+ uint8_t sense[32]; -+ gboolean ret = FALSE; -+ gint rc; -+ gint timeout_msec = 30000; /* 30 seconds */ -+ -+ g_return_val_if_fail (fd != -1, FALSE); -+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -+ -+ /* See http://sg.danny.cz/sg/sg_io.html and http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/index.html -+ * for detailed information about how the SG_IO ioctl work -+ */ -+ -+ memset (sense, 0, sizeof (sense)); -+ memset (&io_v4, 0, sizeof (io_v4)); -+ io_v4.guard = 'Q'; -+ io_v4.protocol = BSG_PROTOCOL_SCSI; -+ io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD; -+ io_v4.request_len = cdb_len; -+ io_v4.request = (uintptr_t) cdb; -+ io_v4.max_response_len = sizeof (sense); -+ io_v4.response = (uintptr_t) sense; -+ io_v4.timeout = timeout_msec; -+ -+ rc = ioctl (fd, SG_IO, &io_v4); -+ if (rc != 0) -+ { -+ /* could be that the driver doesn't do version 4, try version 3 */ -+ if (errno == EINVAL) -+ { -+ struct sg_io_hdr io_hdr; -+ memset (&io_hdr, 0, sizeof (struct sg_io_hdr)); -+ io_hdr.interface_id = 'S'; -+ io_hdr.cmdp = (unsigned char*) cdb; -+ io_hdr.cmd_len = cdb_len; -+ io_hdr.dxfer_direction = SG_DXFER_NONE; -+ io_hdr.sbp = sense; -+ io_hdr.mx_sb_len = sizeof (sense); -+ io_hdr.timeout = timeout_msec; -+ -+ rc = ioctl (fd, SG_IO, &io_hdr); -+ if (rc != 0) -+ { -+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), -+ "SGIO v3 ioctl failed (v4 not supported): %m"); -+ goto out; -+ } -+ else -+ { -+ if (!(io_hdr.status == 0 && -+ io_hdr.host_status == 0 && -+ io_hdr.driver_status == 0)) -+ { -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ "Non-GOOD SCSI status from SGIO v3 ioctl: " -+ "status=%d host_status=%d driver_status=%d", -+ io_hdr.status, -+ io_hdr.host_status, -+ io_hdr.driver_status); -+ goto out; -+ } -+ } -+ } -+ else -+ { -+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), -+ "SGIO v4 ioctl failed: %m"); -+ goto out; -+ } -+ } -+ else -+ { -+ if (!(io_v4.device_status == 0 && -+ io_v4.transport_status == 0 && -+ io_v4.driver_status == 0)) -+ { -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ "Non-GOOD SCSI status from SGIO v4 ioctl: " -+ "device_status=%d transport_status=%d driver_status=%d", -+ io_v4.device_status, -+ io_v4.transport_status, -+ io_v4.driver_status); -+ goto out; -+ } -+ } -+ -+ ret = TRUE; -+ -+ out: -+ return ret; -+} -+ -+static gboolean -+send_scsi_start_stop_command_sync (gint fd, -+ GError **error) -+{ -+ uint8_t cdb[6]; -+ -+ /* SBC3 (SCSI Block Commands), 5.20 START STOP UNIT command -+ */ -+ memset (cdb, 0, sizeof cdb); -+ cdb[0] = 0x1b; /* OPERATION CODE: START STOP UNIT */ -+ -+ return send_scsi_command_sync (fd, cdb, sizeof cdb, error); -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - static gboolean - handle_power_off (UDisksDrive *_drive, - GDBusMethodInvocation *invocation, -@@ -1216,6 +1338,7 @@ handle_power_off (UDisksDrive *_drive, - gid_t caller_gid; - pid_t caller_pid; - GList *sibling_objects = NULL, *l; -+ gint fd = -1; - - object = udisks_daemon_util_dup_object (drive, &error); - if (object == NULL) -@@ -1324,10 +1447,10 @@ handle_power_off (UDisksDrive *_drive, - { - UDisksBlock *block_to_sync = UDISKS_BLOCK (l->data); - const gchar *device_file; -- gint fd; -+ gint device_fd; - device_file = udisks_block_get_device (block_to_sync); -- fd = open (device_file, O_RDONLY|O_NONBLOCK|O_EXCL); -- if (fd == -1) -+ device_fd = open (device_file, O_RDONLY|O_NONBLOCK|O_EXCL); -+ if (device_fd == -1) - { - g_dbus_method_invocation_return_error (invocation, - UDISKS_ERROR, -@@ -1336,7 +1459,7 @@ handle_power_off (UDisksDrive *_drive, - device_file); - goto out; - } -- if (fsync (fd) != 0) -+ if (fsync (device_fd) != 0) - { - g_dbus_method_invocation_return_error (invocation, - UDISKS_ERROR, -@@ -1345,7 +1468,7 @@ handle_power_off (UDisksDrive *_drive, - device_file); - goto out; - } -- if (close (fd) != 0) -+ if (close (device_fd) != 0) - { - g_dbus_method_invocation_return_error (invocation, - UDISKS_ERROR, -@@ -1356,9 +1479,45 @@ handle_power_off (UDisksDrive *_drive, - } - } - -- escaped_device = udisks_daemon_util_escape_and_quote (udisks_block_get_device (block)); -+ /* Send the "SCSI START STOP UNIT" command to request that the unit -+ * be stopped but don't treat failure as fatal. In fact some -+ * USB-attached hard-disks fails with this command, probably due to -+ * the SCSI/SATA translation layer. -+ */ -+ fd = open (udisks_block_get_device (block), O_RDONLY|O_NONBLOCK|O_EXCL); -+ if (fd == -1) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ UDISKS_ERROR, -+ UDISKS_ERROR_FAILED, -+ "Error opening %s: %m", -+ udisks_block_get_device (block)); -+ goto out; -+ } -+ if (!send_scsi_start_stop_command_sync (fd, &error)) -+ { -+ udisks_warning ("Ignoring SCSI command START STOP UNIT failure (%s) on %s", -+ error->message, -+ udisks_block_get_device (block)); -+ g_clear_error (&error); -+ } -+ else -+ { -+ udisks_notice ("Powering off %s - successfully sent SCSI command START STOP UNIT", -+ udisks_block_get_device (block)); -+ } -+ if (close (fd) != 0) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ UDISKS_ERROR, -+ UDISKS_ERROR_FAILED, -+ "Error closing %s: %m", -+ udisks_block_get_device (block)); -+ goto out; -+ } -+ fd = -1; - -- /* TODO: Send the eject? Send SCSI START STOP UNIT? */ -+ escaped_device = udisks_daemon_util_escape_and_quote (udisks_block_get_device (block)); - device = udisks_linux_drive_object_get_device (object, TRUE /* get_hw */); - if (device == NULL) - { -@@ -1405,10 +1564,20 @@ handle_power_off (UDisksDrive *_drive, - } - } - fclose (f); -+ udisks_notice ("Powered off %s - successfully wrote to sysfs path %s", -+ udisks_block_get_device (block), -+ remove_path); - - udisks_drive_complete_power_off (UDISKS_DRIVE (drive), invocation); - - out: -+ if (fd != -1) -+ { -+ if (close (fd) != 0) -+ { -+ udisks_warning ("Error closing device: %m"); -+ } -+ } - g_list_free_full (blocks_to_sync, g_object_unref); - g_list_free_full (sibling_objects, g_object_unref); - g_free (remove_path); -diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c -index 48cc6e6..534ef4d 100644 ---- a/src/udiskslinuxdriveata.c -+++ b/src/udiskslinuxdriveata.c -@@ -1943,7 +1943,7 @@ udisks_linux_drive_ata_secure_erase_sync (UDisksLinuxDriveAta *drive, - /* First get the IDENTIFY data directly from the drive, for sanity checks */ - { - /* ATA8: 7.16 IDENTIFY DEVICE - ECh, PIO Data-In */ -- UDisksAtaCommandInput input = {.command = 0xec}; -+ UDisksAtaCommandInput input = {.command = 0xec, .count = 1}; - UDisksAtaCommandOutput output = {.buffer = identify.buf, .buffer_size = sizeof (identify.buf)}; - if (!udisks_ata_send_command_sync (fd, - -1, -diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c -index 4c8d8aa..f243046 100644 ---- a/src/udiskslinuxfilesystem.c -+++ b/src/udiskslinuxfilesystem.c -@@ -348,13 +348,16 @@ find_mount_options_for_fs (const gchar *fstype) - static gid_t - find_primary_gid (uid_t uid) - { -- struct passwd *pw; -+ struct passwd *pw = NULL; -+ struct passwd pwstruct; -+ gchar pwbuf[8192]; -+ int rc; - gid_t gid; - - gid = (gid_t) - 1; - -- pw = getpwuid (uid); -- if (pw == NULL) -+ rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw); -+ if (rc != 0 || pw == NULL) - { - udisks_warning ("Error looking up uid %d: %m", uid); - goto out; -@@ -370,7 +373,10 @@ is_uid_in_gid (uid_t uid, - gid_t gid) - { - gboolean ret; -- struct passwd *pw; -+ struct passwd *pw = NULL; -+ struct passwd pwstruct; -+ gchar pwbuf[8192]; -+ int rc; - static gid_t supplementary_groups[128]; - int num_supplementary_groups = 128; - int n; -@@ -379,8 +385,8 @@ is_uid_in_gid (uid_t uid, - - ret = FALSE; - -- pw = getpwuid (uid); -- if (pw == NULL) -+ rc = getpwuid_r (uid, &pwstruct, pwbuf, sizeof pwbuf, &pw); -+ if (rc != 0 || pw == NULL) - { - udisks_warning ("Error looking up uid %d: %m", uid); - goto out; -diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c -index 802551f..b181933 100644 ---- a/src/udisksspawnedjob.c -+++ b/src/udisksspawnedjob.c -@@ -371,22 +371,25 @@ static void - child_setup (gpointer user_data) - { - UDisksSpawnedJob *job = UDISKS_SPAWNED_JOB (user_data); -- struct passwd *pw; -+ struct passwd pwstruct; -+ gchar pwbuf[8192]; -+ struct passwd *pw = NULL; -+ int rc; - gid_t egid; - - if (job->run_as_uid == getuid () && job->run_as_euid == geteuid ()) - goto out; - -- pw = getpwuid (job->run_as_euid); -- if (pw == NULL) -+ rc = getpwuid_r (job->run_as_euid, &pwstruct, pwbuf, sizeof pwbuf, &pw); -+ if (rc != 0 || pw == NULL) - { - g_printerr ("No password record for uid %d: %m\n", (gint) job->run_as_euid); - abort (); - } - egid = pw->pw_gid; - -- pw = getpwuid (job->run_as_uid); -- if (pw == NULL) -+ rc = getpwuid_r (job->run_as_uid, &pwstruct, pwbuf, sizeof pwbuf, &pw); -+ if (rc != 0 || pw == NULL) - { - g_printerr ("No password record for uid %d: %m\n", (gint) job->run_as_uid); - abort (); -diff --git a/tools/udisksctl.c b/tools/udisksctl.c -index 97b0f17..c87fe9f 100644 ---- a/tools/udisksctl.c -+++ b/tools/udisksctl.c -@@ -1691,6 +1691,12 @@ handle_command_loop (gint *argc, - goto out; - } - -+ if (udisks_object_peek_loop (object) == NULL) -+ { -+ g_printerr ("Error: specified object is not a loop device\n"); -+ goto out; -+ } -+ - delete_try_again: - error = NULL; - if (!udisks_loop_call_delete_sync (udisks_object_peek_loop (object), -@@ -2009,6 +2015,238 @@ handle_command_smart_simulate (gint *argc, - - /* ---------------------------------------------------------------------------------------------------- */ - -+static gchar *opt_power_off_object_path = NULL; -+static gchar *opt_power_off_device = NULL; -+static gboolean opt_power_off_no_user_interaction = FALSE; -+ -+static const GOptionEntry command_power_off_entries[] = -+{ -+ { -+ "object-path", -+ 'p', -+ 0, -+ G_OPTION_ARG_STRING, -+ &opt_power_off_object_path, -+ "Object path for ATA device", -+ NULL -+ }, -+ { -+ "block-device", -+ 'b', -+ 0, -+ G_OPTION_ARG_STRING, -+ &opt_power_off_device, -+ "Device file for ATA device", -+ NULL -+ }, -+ { -+ "no-user-interaction", -+ 0, /* no short option */ -+ 0, -+ G_OPTION_ARG_NONE, -+ &opt_power_off_no_user_interaction, -+ "Do not authenticate the user if needed", -+ NULL -+ }, -+ { -+ NULL -+ } -+}; -+ -+static gint -+handle_command_power_off (gint *argc, -+ gchar **argv[], -+ gboolean request_completion, -+ const gchar *completion_cur, -+ const gchar *completion_prev) -+{ -+ gint ret; -+ GOptionContext *o; -+ gchar *s; -+ gboolean complete_objects; -+ gboolean complete_devices; -+ GList *l; -+ GList *objects; -+ UDisksObject *object; -+ UDisksDriveAta *ata; -+ guint n; -+ GVariant *options; -+ GVariantBuilder builder; -+ GError *error; -+ -+ ret = 1; -+ opt_power_off_object_path = NULL; -+ opt_power_off_device = NULL; -+ object = NULL; -+ options = NULL; -+ -+ modify_argv0_for_command (argc, argv, "power-off"); -+ -+ o = g_option_context_new (NULL); -+ if (request_completion) -+ g_option_context_set_ignore_unknown_options (o, TRUE); -+ g_option_context_set_help_enabled (o, FALSE); -+ g_option_context_set_summary (o, "Safely power off a drive."); -+ g_option_context_add_main_entries (o, -+ command_power_off_entries, -+ NULL /* GETTEXT_PACKAGE*/); -+ -+ complete_objects = FALSE; -+ if (request_completion && (g_strcmp0 (completion_prev, "--object-path") == 0 || g_strcmp0 (completion_prev, "-p") == 0)) -+ { -+ complete_objects = TRUE; -+ remove_arg ((*argc) - 1, argc, argv); -+ } -+ -+ complete_devices = FALSE; -+ if (request_completion && (g_strcmp0 (completion_prev, "--block-device") == 0 || g_strcmp0 (completion_prev, "-b") == 0)) -+ { -+ complete_devices = TRUE; -+ remove_arg ((*argc) - 1, argc, argv); -+ } -+ -+ if (!g_option_context_parse (o, argc, argv, NULL)) -+ { -+ if (!request_completion) -+ { -+ s = g_option_context_get_help (o, FALSE, NULL); -+ g_printerr ("%s", s); -+ g_free (s); -+ goto out; -+ } -+ } -+ -+ if (request_completion) -+ { -+ if ((opt_power_off_object_path == NULL && !complete_objects) && -+ (opt_power_off_device == NULL && !complete_devices)) -+ { -+ g_print ("--object-path \n" -+ "--block-device \n"); -+ } -+ -+ if (complete_objects) -+ { -+ const gchar *object_path; -+ objects = g_dbus_object_manager_get_objects (udisks_client_get_object_manager (client)); -+ for (l = objects; l != NULL; l = l->next) -+ { -+ object = UDISKS_OBJECT (l->data); -+ ata = udisks_object_peek_drive_ata (object); -+ if (ata != NULL) -+ { -+ object_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (object)); -+ g_assert (g_str_has_prefix (object_path, "/org/freedesktop/UDisks2/")); -+ g_print ("%s \n", object_path + sizeof ("/org/freedesktop/UDisks2/") - 1); -+ } -+ } -+ g_list_foreach (objects, (GFunc) g_object_unref, NULL); -+ g_list_free (objects); -+ } -+ -+ if (complete_devices) -+ { -+ objects = g_dbus_object_manager_get_objects (udisks_client_get_object_manager (client)); -+ for (l = objects; l != NULL; l = l->next) -+ { -+ object = UDISKS_OBJECT (l->data); -+ ata = udisks_object_peek_drive_ata (object); -+ if (ata != NULL) -+ { -+ const gchar * const *symlinks; -+ UDisksBlock *block; -+ block = udisks_client_get_block_for_drive (client, udisks_object_peek_drive (object), TRUE); -+ g_print ("%s \n", udisks_block_get_device (block)); -+ symlinks = udisks_block_get_symlinks (block); -+ for (n = 0; symlinks != NULL && symlinks[n] != NULL; n++) -+ g_print ("%s \n", symlinks[n]); -+ } -+ } -+ g_list_foreach (objects, (GFunc) g_object_unref, NULL); -+ g_list_free (objects); -+ } -+ goto out; -+ } -+ -+ g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); -+ if (opt_power_off_no_user_interaction) -+ { -+ g_variant_builder_add (&builder, -+ "{sv}", -+ "auth.no_user_interaction", g_variant_new_boolean (TRUE)); -+ } -+ options = g_variant_builder_end (&builder); -+ g_variant_ref_sink (options); -+ -+ if (opt_power_off_object_path != NULL) -+ { -+ object = lookup_object_by_path (opt_power_off_object_path); -+ if (object == NULL) -+ { -+ g_printerr ("Error looking up object with path %s\n", opt_power_off_object_path); -+ goto out; -+ } -+ } -+ else if (opt_power_off_device != NULL) -+ { -+ UDisksObject *block_object; -+ UDisksDrive *drive; -+ block_object = lookup_object_by_device (opt_power_off_device); -+ if (block_object == NULL) -+ { -+ g_printerr ("Error looking up object for device %s\n", opt_power_off_device); -+ goto out; -+ } -+ drive = udisks_client_get_drive_for_block (client, udisks_object_peek_block (block_object)); -+ object = (UDisksObject *) g_dbus_interface_dup_object (G_DBUS_INTERFACE (drive)); -+ g_object_unref (block_object); -+ } -+ else -+ { -+ s = g_option_context_get_help (o, FALSE, NULL); -+ g_printerr ("%s", s); -+ g_free (s); -+ goto out; -+ } -+ -+ try_again: -+ error = NULL; -+ if (!udisks_drive_call_power_off_sync (udisks_object_peek_drive (object), -+ options, -+ NULL, /* GCancellable */ -+ &error)) -+ { -+ if (error->domain == UDISKS_ERROR && -+ error->code == UDISKS_ERROR_NOT_AUTHORIZED_CAN_OBTAIN && -+ setup_local_polkit_agent ()) -+ { -+ g_error_free (error); -+ goto try_again; -+ } -+ g_dbus_error_strip_remote_error (error); -+ g_printerr ("Error powering off drive: %s (%s, %d)\n", -+ error->message, g_quark_to_string (error->domain), error->code); -+ g_clear_error (&error); -+ g_object_unref (object); -+ goto out; -+ } -+ -+ g_object_unref (object); -+ -+ -+ ret = 0; -+ -+ out: -+ if (options != NULL) -+ g_variant_unref (options); -+ g_option_context_free (o); -+ g_free (opt_power_off_object_path); -+ g_free (opt_power_off_device); -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - static gchar *opt_info_object = NULL; - static gchar *opt_info_device = NULL; - static gchar *opt_info_drive = NULL; -@@ -2855,6 +3093,7 @@ usage (gint *argc, gchar **argv[], gboolean use_stdout) - " lock Lock an encrypted device\n" - " loop-setup Set-up a loop device\n" - " loop-delete Delete a loop device\n" -+ " power-off Safely power off a drive\n" - " smart-simulate Set SMART data for a drive\n" - "\n" - "Use \"%s COMMAND --help\" to get help on each command.\n", -@@ -3053,6 +3292,15 @@ main (int argc, - completion_prev); - goto out; - } -+ else if (g_strcmp0 (command, "power-off") == 0) -+ { -+ ret = handle_command_power_off (&argc, -+ &argv, -+ request_completion, -+ completion_cur, -+ completion_prev); -+ goto out; -+ } - else if (g_strcmp0 (command, "dump") == 0) - { - ret = handle_command_dump (&argc, -@@ -3156,6 +3404,7 @@ main (int argc, - "unlock \n" - "loop-setup \n" - "loop-delete \n" -+ "power-off \n" - "smart-simulate \n" - ); - ret = 0; diff --git a/pcr/udisks2-elogind/udisks-enable-elogind.patch b/pcr/udisks2-elogind/udisks-enable-elogind.patch deleted file mode 100644 index a92b6c079..000000000 --- a/pcr/udisks2-elogind/udisks-enable-elogind.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/configure.ac 2016-11-09 17:01:56.847354884 +0100 -+++ b/configure.ac 2016-11-09 17:06:15.057357196 +0100 -@@ -166,6 +166,17 @@ - AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) - AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) - -+PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], -+ [have_libelogind=yes], -+ [have_libelogins=no]) -+AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes) -+if test "x$have_libelogind" = "xyes"; then -+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) -+fi -+AC_SUBST(HAVE_LIBELOGIND) -+AC_SUBST(LIBELOGIND_CFLAGS) -+AC_SUBST(LIBELOGIND_LIBS) -+ - # udevdir - AC_ARG_WITH([udevdir], - AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]), -@@ -254,6 +265,7 @@ - udevdir: ${udevdir} - systemdsystemunitdir: ${systemdsystemunitdir} - using libsystemd-login: ${have_libsystemd_login} -+ using libelogind: ${have_libelogind} - use /media for mounting: ${fhs_media} - acl support: ${have_acl} - ---- a/src/Makefile.am 2016-11-09 17:01:39.487354728 +0100 -+++ b/src/Makefile.am 2016-11-09 17:08:10.608358230 +0100 -@@ -91,6 +91,7 @@ - $(POLKIT_GOBJECT_1_CFLAGS) \ - $(ACL_CFLAGS) \ - $(LIBSYSTEMD_LOGIN_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(NULL) - - libudisks_daemon_la_LIBADD = \ -@@ -101,6 +102,7 @@ - $(POLKIT_GOBJECT_1_LIBS) \ - $(ACL_LIBS) \ - $(LIBSYSTEMD_LOGIN_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(top_builddir)/udisks/libudisks2.la \ - $(NULL) - ---- a/src/udisksdaemonutil.c 2016-11-09 17:01:30.452354647 +0100 -+++ b/src/udisksdaemonutil.c 2016-11-09 17:35:49.230353328 +0100 -@@ -44,7 +44,15 @@ - #if defined(HAVE_LIBSYSTEMD_LOGIN) - #include - #include -+#endif -+ -+#if defined(HAVE_ELOGIND) && !defined(HAVE_LIBSYSTEMD_LOGIN) -+#include -+/* re-use HAVE_LIBSYSTEMD_LOGIN to not clutter the source file */ -+#define HAVE_LIBSYSTEMD_LOGIN 1 -+#endif - -+#if defined(HAVE_LIBSYSTEMD_LOGIN) - #define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0) - #endif - diff --git a/pcr/yum-metadata-parser/PKGBUILD b/pcr/yum-metadata-parser/PKGBUILD deleted file mode 100644 index a7b3373cc..000000000 --- a/pcr/yum-metadata-parser/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: David P. -# Contributorr: Lukas Sabota -# Contributor: Patrick McCarty -# Contributor: Mariusz Libera -# Contributor: Chris Tusa -# Contributor: Thore Bunde - -pkgname='yum-metadata-parser' -pkgver='1.1.4' -pkgrel=10 -pkgdesc='C-based metadata parser to quickly parse xml metadata into sqlite databases.' -arch=('any') -license=('GPL') -url='http://yum.baseurl.org/download/yum-metadata-parser/' -depends=('python2' 'libxml2' 'glib2') -makedepends=('python2-pip') -source=('http://yum.baseurl.org/download/yum-metadata-parser/yum-metadata-parser-1.1.4.tar.gz') -sha256sums=('f1560a284541feb720c3ae35b6b31f80c2be5cb9ca86b3a1ee9459846f821ada') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - pip2 install . --isolated --root="${pkgdir}" --no-deps --ignore-installed --build . -} - - diff --git a/pcr/yum/PKGBUILD b/pcr/yum/PKGBUILD deleted file mode 100644 index 1d35d5ed6..000000000 --- a/pcr/yum/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: David P. -# Contributor: Achilleas Pipinellis -# Contributor: William Giokas <1007380@gmail.com> -# Contributor: Fernando M f[at]beford.net -# Contributor: Ivo Benner -# Contributor: Luka Perkov lukaperkov net> -# Contributor: Rob Taylor - -pkgname=yum -pkgver=3.4.3 -pkgrel=6.parabola1 -pkgdesc="a popular channel based package manager for RPM distros." -arch=('armv7h' 'i686' 'x86_64') -license=('GPL') -url="http://yum.baseurl.org/" -depends=('python2' 'intltool' 'urlgrabber' 'rpm-org' 'python2-pysqlite' 'yum-metadata-parser' 'python2-iniparse' 'python2-pyliblzma') -source=("http://yum.baseurl.org/download/3.4/yum-${pkgver}.tar.gz" - "yum.patch::http://pkgs.fedoraproject.org/cgit/yum.git/plain/yum-HEAD.patch?h=f21" - 'remove-init-dir-makefile.patch') -md5sums=('7c8ea8beba5b4e7fe0c215e4ebaa26ed' - '3ed35721daf75fd56590bd2d2b993ddc' - '14d68bd689ea76a44567bc2dd0e64cb1') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Patch up to Fedora current - patch -p1 < "${srcdir}/yum.patch" - - cd "etc" - - # Apply patch to remove the RedHat style init script from being installed - patch < "${srcdir}/remove-init-dir-makefile.patch" -} - -build() { - # Patching python2 shebangs - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find ${srcdir} -name '*.py') - sed -i -e "s/PYTHON=python/PYTHON=python2/" "${srcdir}/${pkgname}-${pkgver}/Makefile" - - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" INIT=systemd install - - mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" - rmdir "${pkgdir}/usr/sbin/" -} diff --git a/pcr/yum/remove-init-dir-makefile.patch b/pcr/yum/remove-init-dir-makefile.patch deleted file mode 100644 index 671efdf9f..000000000 --- a/pcr/yum/remove-init-dir-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.dist 2009-01-08 13:36:04.598489682 -0700 -+++ Makefile 2009-01-08 13:40:23.116347817 -0700 -@@ -13,9 +13,6 @@ - mkdir -p $(DESTDIR)/etc/logrotate.d - install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum - -- mkdir -p $(DESTDIR)/etc/rc.d/init.d -- install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd -- - mkdir -p $(DESTDIR)/etc/dbus-1/system.d/ - install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf - -- cgit v1.2.3