From fcce4e670cd2d81990b3f50e8a682b44d40a73cc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 2 Sep 2014 06:41:22 -0300 Subject: remove parabola suffix and add complex pkgrel on the packages --- libre/abs-parabola/PKGBUILD | 48 -- libre/abs/PKGBUILD | 46 ++ libre/audex-parabola/PKGBUILD | 44 -- libre/audex-parabola/audex.install | 12 - libre/audex-parabola/google_regex.patch | 14 - libre/audex/PKGBUILD | 42 ++ libre/audex/audex.install | 12 + libre/audex/google_regex.patch | 14 + libre/audio-convert-parabola/ChangeLog | 5 - libre/audio-convert-parabola/PKGBUILD | 33 - libre/audio-convert/ChangeLog | 5 + libre/audio-convert/PKGBUILD | 31 + libre/avidemux-parabola/PKGBUILD | 124 ---- libre/avidemux-parabola/PKGBUILD.WIP | 94 --- libre/avidemux-parabola/avidemux.install | 11 - libre/avidemux/PKGBUILD | 122 ++++ libre/avidemux/PKGBUILD.WIP | 94 +++ libre/avidemux/avidemux.install | 11 + libre/bfgminer-parabola/PKGBUILD | 49 -- libre/bfgminer-parabola/change-kernel-path.patch | 98 --- .../bfgminer-parabola/remove-dangerous-rpath.patch | 11 - libre/bfgminer/PKGBUILD | 47 ++ libre/bfgminer/change-kernel-path.patch | 98 +++ libre/bfgminer/remove-dangerous-rpath.patch | 11 + libre/bitlbee-parabola/PKGBUILD | 56 -- libre/bitlbee-parabola/bitlbee.install | 22 - libre/bitlbee-parabola/bitlbee.tmpfiles | 1 - libre/bitlbee/PKGBUILD | 54 ++ libre/bitlbee/bitlbee.install | 22 + libre/bitlbee/bitlbee.tmpfiles | 1 + libre/cups-filters-parabola/PKGBUILD | 53 -- libre/cups-filters-parabola/cups-browsed.service | 10 - libre/cups-filters-parabola/poppler_buildfix.diff | 276 -------- libre/cups-filters/PKGBUILD | 52 ++ libre/cups-filters/cups-browsed.service | 10 + libre/cups-filters/poppler_buildfix.diff | 276 ++++++++ libre/ecasound-parabola/PKGBUILD | 57 -- libre/ecasound-parabola/ruby2.patch | 12 - libre/ecasound/PKGBUILD | 55 ++ libre/ecasound/ruby2.patch | 12 + libre/engrampa-parabola/PKGBUILD | 49 -- libre/engrampa-parabola/engrampa.install | 13 - libre/engrampa-parabola/fr-rpm-bsdtar.patch | 60 -- libre/engrampa/PKGBUILD | 48 ++ libre/engrampa/engrampa.install | 13 + libre/engrampa/fr-rpm-bsdtar.patch | 60 ++ libre/file-roller-parabola/PKGBUILD | 38 -- libre/file-roller-parabola/bug708854.patch | 92 --- libre/file-roller-parabola/bug709035.patch | 43 -- libre/file-roller-parabola/file-roller.install | 13 - libre/file-roller-parabola/rePKGBUILD | 26 - libre/file-roller/PKGBUILD | 36 + libre/file-roller/bug708854.patch | 92 +++ libre/file-roller/bug709035.patch | 43 ++ libre/file-roller/file-roller.install | 13 + libre/file-roller/rePKGBUILD | 26 + libre/filesystem-parabola/PKGBUILD | 167 ----- libre/filesystem-parabola/crypttab | 17 - libre/filesystem-parabola/filesystem.install | 79 --- libre/filesystem-parabola/fstab | 4 - libre/filesystem-parabola/group | 41 -- libre/filesystem-parabola/gshadow | 41 -- libre/filesystem-parabola/host.conf | 8 - libre/filesystem-parabola/hosts | 9 - libre/filesystem-parabola/issue | 2 - libre/filesystem-parabola/ld.so.conf | 7 - libre/filesystem-parabola/locale.sh | 27 - .../modprobe.d.usb-load-ehci-first | 2 - libre/filesystem-parabola/motd | 0 libre/filesystem-parabola/nsswitch.conf | 19 - libre/filesystem-parabola/os-release | 8 - libre/filesystem-parabola/parabola.7.txt | 91 --- libre/filesystem-parabola/passwd | 14 - libre/filesystem-parabola/profile | 27 - libre/filesystem-parabola/resolv.conf | 8 - libre/filesystem-parabola/securetty | 15 - libre/filesystem-parabola/shadow | 14 - libre/filesystem-parabola/shells | 8 - libre/filesystem/PKGBUILD | 165 +++++ libre/filesystem/crypttab | 17 + libre/filesystem/filesystem.install | 79 +++ libre/filesystem/fstab | 4 + libre/filesystem/group | 41 ++ libre/filesystem/gshadow | 41 ++ libre/filesystem/host.conf | 8 + libre/filesystem/hosts | 9 + libre/filesystem/issue | 2 + libre/filesystem/ld.so.conf | 7 + libre/filesystem/locale.sh | 27 + libre/filesystem/modprobe.d.usb-load-ehci-first | 2 + libre/filesystem/motd | 0 libre/filesystem/nsswitch.conf | 19 + libre/filesystem/os-release | 8 + libre/filesystem/parabola.7.txt | 91 +++ libre/filesystem/passwd | 14 + libre/filesystem/profile | 27 + libre/filesystem/resolv.conf | 8 + libre/filesystem/securetty | 15 + libre/filesystem/shadow | 14 + libre/filesystem/shells | 8 + libre/gnormalize-parabola/PKGBUILD | 62 -- libre/gnormalize-parabola/gnormalize.desktop | 9 - libre/gnormalize-parabola/gnormalize.install | 14 - libre/gnormalize/PKGBUILD | 60 ++ libre/gnormalize/gnormalize.desktop | 9 + libre/gnormalize/gnormalize.install | 14 + ...ulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch | 50 -- libre/grub-parabola/09_parabola | 195 ------ libre/grub-parabola/60_memtest86+ | 32 - libre/grub-parabola/PKGBUILD | 385 ----------- .../grub-10_linux-detect-parabola-initramfs.patch | 54 -- .../grub-10_linux-rebrand-free-distros.patch | 23 - libre/grub-parabola/grub-2.00-fix-docs.patch | 21 - .../grub-parabola/grub-2.00-mkinitcpio-0.15.patch | 11 - .../grub-2.00.5086-fix-lvm-parsing.patch | 54 -- .../grub-add-GRUB_COLOR_variables.patch | 32 - libre/grub-parabola/grub.default | 50 -- libre/grub-parabola/grub.install | 33 - .../parabola_grub_mkconfig_fixes.patch | 170 ----- ...ulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch | 50 ++ libre/grub/09_parabola | 195 ++++++ libre/grub/60_memtest86+ | 32 + libre/grub/PKGBUILD | 384 +++++++++++ .../grub-10_linux-detect-parabola-initramfs.patch | 54 ++ .../grub/grub-10_linux-rebrand-free-distros.patch | 23 + libre/grub/grub-2.00-fix-docs.patch | 21 + libre/grub/grub-2.00-mkinitcpio-0.15.patch | 11 + libre/grub/grub-2.00.5086-fix-lvm-parsing.patch | 54 ++ libre/grub/grub-add-GRUB_COLOR_variables.patch | 32 + libre/grub/grub.default | 50 ++ libre/grub/grub.install | 33 + libre/grub/parabola_grub_mkconfig_fixes.patch | 170 +++++ libre/gst-plugins-bad-parabola/PKGBUILD | 47 -- libre/gst-plugins-bad/PKGBUILD | 45 ++ libre/gstreamer0.10-bad-parabola/PKGBUILD | 73 --- .../disable-assrender-test.patch | 11 - .../disable-camerabin-test.patch | 10 - .../gstreamer0.10-bad-plugins.install | 11 - libre/gstreamer0.10-bad/PKGBUILD | 71 ++ .../gstreamer0.10-bad/disable-assrender-test.patch | 11 + .../gstreamer0.10-bad/disable-camerabin-test.patch | 10 + .../gstreamer0.10-bad-plugins.install | 11 + libre/gummiboot-parabola/PKGBUILD | 52 -- libre/gummiboot-parabola/gummiboot.install | 13 - libre/gummiboot-parabola/loader.conf | 2 - libre/gummiboot-parabola/parabola.conf | 7 - libre/gummiboot-parabola/splash-parabola.bmp | Bin 470410 -> 0 bytes libre/gummiboot/PKGBUILD | 51 ++ libre/gummiboot/gummiboot.install | 13 + libre/gummiboot/loader.conf | 2 + libre/gummiboot/parabola.conf | 7 + libre/gummiboot/splash-parabola.bmp | Bin 0 -> 470410 bytes libre/hardinfo-parabola/PKGBUILD | 42 -- libre/hardinfo-parabola/fixsensors.patch | 13 - libre/hardinfo-parabola/hardinfo.distro | 1 - libre/hardinfo/PKGBUILD | 40 ++ libre/hardinfo/fixsensors.patch | 13 + libre/hardinfo/hardinfo.distro | 1 + libre/libquicktime-parabola/PKGBUILD | 42 -- libre/libquicktime-parabola/ffmpeg2.0.patch | 135 ---- libre/libquicktime/PKGBUILD | 40 ++ libre/libquicktime/ffmpeg2.0.patch | 135 ++++ libre/lsb-release-parabola/PKGBUILD | 45 -- libre/lsb-release-parabola/lsb-release.install | 12 - .../lsb_release_description.patch | 11 - libre/lsb-release/PKGBUILD | 43 ++ libre/lsb-release/lsb-release.install | 12 + libre/lsb-release/lsb_release_description.patch | 11 + libre/luxrays-parabola/PKGBUILD | 81 --- libre/luxrays-parabola/QTBUG-22829.diff | 17 - libre/luxrays-parabola/luxmark_scenes_path.diff | 20 - libre/luxrays/PKGBUILD | 76 +++ libre/luxrays/QTBUG-22829.diff | 17 + libre/luxrays/luxmark_scenes_path.diff | 20 + libre/luxrender-parabola/PKGBUILD | 63 -- libre/luxrender-parabola/force_python3.diff | 12 - libre/luxrender/PKGBUILD | 61 ++ libre/luxrender/force_python3.diff | 12 + libre/mkisolinux-parabola/PKGBUILD | 31 - libre/mkisolinux-parabola/boot.msg | 15 - libre/mkisolinux-parabola/mkisolinux | 116 ---- libre/mkisolinux-parabola/mkisolinux.conf | 39 -- libre/mkisolinux-parabola/options.msg | 6 - libre/mkisolinux/PKGBUILD | 29 + libre/mkisolinux/boot.msg | 15 + libre/mkisolinux/mkisolinux | 116 ++++ libre/mkisolinux/mkisolinux.conf | 39 ++ libre/mkisolinux/options.msg | 6 + libre/mkpxelinux-parabola/PKGBUILD | 31 - libre/mkpxelinux-parabola/boot.msg | 14 - libre/mkpxelinux-parabola/mkpxelinux | 91 --- libre/mkpxelinux-parabola/mkpxelinux.conf | 37 -- libre/mkpxelinux-parabola/options.msg | 6 - libre/mkpxelinux/PKGBUILD | 29 + libre/mkpxelinux/boot.msg | 14 + libre/mkpxelinux/mkpxelinux | 91 +++ libre/mkpxelinux/mkpxelinux.conf | 37 ++ libre/mkpxelinux/options.msg | 6 + libre/mksyslinux-parabola/PKGBUILD | 30 - libre/mksyslinux-parabola/boot.msg | 15 - libre/mksyslinux-parabola/mksyslinux | 144 ---- libre/mksyslinux-parabola/mksyslinux.conf | 34 - libre/mksyslinux-parabola/options.msg | 6 - libre/mksyslinux/PKGBUILD | 28 + libre/mksyslinux/boot.msg | 15 + libre/mksyslinux/mksyslinux | 144 ++++ libre/mksyslinux/mksyslinux.conf | 34 + libre/mksyslinux/options.msg | 6 + libre/mplayer-parabola/PKGBUILD | 128 ---- libre/mplayer-parabola/cdio-includes.patch | 43 -- libre/mplayer-parabola/giflib51.patch | 24 - libre/mplayer-parabola/include-samba-4.0.patch | 12 - libre/mplayer-parabola/mplayer.desktop | 22 - libre/mplayer-parabola/mplayer.install | 11 - libre/mplayer-parabola/mplayer.png | Bin 1982 -> 0 bytes libre/mplayer-parabola/revert-icl-fixes.patch | 66 -- libre/mplayer-vaapi-parabola/PKGBUILD | 101 --- libre/mplayer-vaapi-parabola/cdio-includes.patch | 43 -- .../mplayer-vaapi-parabola/include-samba-4.0.patch | 12 - libre/mplayer-vaapi-parabola/mplayer-vaapi.install | 11 - .../subreader-fix-srt-parsing.patch | 40 -- .../tweak-desktop-file.patch | 14 - libre/mplayer-vaapi/PKGBUILD | 100 +++ libre/mplayer-vaapi/cdio-includes.patch | 43 ++ libre/mplayer-vaapi/include-samba-4.0.patch | 12 + libre/mplayer-vaapi/mplayer-vaapi.install | 11 + .../mplayer-vaapi/subreader-fix-srt-parsing.patch | 40 ++ libre/mplayer-vaapi/tweak-desktop-file.patch | 14 + libre/mplayer/PKGBUILD | 126 ++++ libre/mplayer/cdio-includes.patch | 43 ++ libre/mplayer/giflib51.patch | 24 + libre/mplayer/include-samba-4.0.patch | 12 + libre/mplayer/mplayer.desktop | 22 + libre/mplayer/mplayer.install | 11 + libre/mplayer/mplayer.png | Bin 0 -> 1982 bytes libre/mplayer/revert-icl-fixes.patch | 66 ++ libre/nss-parabola/PKGBUILD | 103 --- libre/nss-parabola/add_cacert_ca_certs.patch | 401 ------------ libre/nss-parabola/nss-config.in | 145 ----- libre/nss-parabola/nss.pc.in | 11 - .../ssl-renegotiate-transitional.patch | 21 - libre/nss/PKGBUILD | 101 +++ libre/nss/add_cacert_ca_certs.patch | 401 ++++++++++++ libre/nss/nss-config.in | 145 +++++ libre/nss/nss.pc.in | 11 + libre/nss/ssl-renegotiate-transitional.patch | 21 + libre/ogmrip-parabola/PKGBUILD | 47 -- libre/ogmrip-parabola/ogmrip.changelog | 36 - libre/ogmrip-parabola/ogmrip.install | 11 - libre/ogmrip/PKGBUILD | 45 ++ libre/ogmrip/ogmrip.changelog | 36 + libre/ogmrip/ogmrip.install | 11 + libre/openshot-parabola/PKGBUILD | 28 - libre/openshot-parabola/openshot.install | 12 - libre/openshot/PKGBUILD | 26 + libre/openshot/openshot.install | 12 + libre/pacman-mirrorlist-parabola/PKGBUILD | 25 - libre/pacman-mirrorlist/PKGBUILD | 24 + libre/psi-parabola/PKGBUILD | 39 -- libre/psi-parabola/parabola.patch | 54 -- libre/psi-parabola/psi.install | 12 - libre/psi/PKGBUILD | 37 ++ libre/psi/parabola.patch | 54 ++ libre/psi/psi.install | 12 + libre/reflector-parabola/PKGBUILD | 47 -- libre/reflector-parabola/rebranding.patch | 64 -- libre/reflector/PKGBUILD | 45 ++ libre/reflector/rebranding.patch | 64 ++ libre/soundkonverter-parabola/PKGBUILD | 52 -- .../soundkonverter-parabola/soundkonverter.install | 12 - libre/soundkonverter/PKGBUILD | 50 ++ libre/soundkonverter/soundkonverter.install | 12 + libre/spectrwm-parabola/LICENSE | 47 -- libre/spectrwm-parabola/PKGBUILD | 81 --- libre/spectrwm-parabola/baraction.sh | 82 --- libre/spectrwm-parabola/spectrwm-no-preload | 2 - libre/spectrwm/LICENSE | 47 ++ libre/spectrwm/PKGBUILD | 79 +++ libre/spectrwm/baraction.sh | 82 +++ libre/spectrwm/spectrwm-no-preload | 2 + libre/syslinux-parabola/PKGBUILD | 280 -------- libre/syslinux-parabola/splash.png | Bin 11947 -> 0 bytes libre/syslinux-parabola/splash.xcf | Bin 30757 -> 0 bytes .../syslinux-6.02-fix-bios-isolinux.patch | 12 - .../syslinux-6.02-fix-chainloading.patch | 47 -- .../syslinux-6.02-fix-efi-ovmf.patch | 621 ------------------ libre/syslinux-parabola/syslinux-install_update | 453 ------------- libre/syslinux-parabola/syslinux.cfg | 78 --- libre/syslinux-parabola/syslinux.install | 43 -- libre/syslinux/PKGBUILD | 278 ++++++++ libre/syslinux/splash.png | Bin 0 -> 11947 bytes libre/syslinux/splash.xcf | Bin 0 -> 30757 bytes .../syslinux/syslinux-6.02-fix-bios-isolinux.patch | 12 + .../syslinux/syslinux-6.02-fix-chainloading.patch | 47 ++ libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch | 621 ++++++++++++++++++ libre/syslinux/syslinux-install_update | 453 +++++++++++++ libre/syslinux/syslinux.cfg | 78 +++ libre/syslinux/syslinux.install | 43 ++ libre/texlive-bin-parabola/09-texlive-fonts.conf | 9 - libre/texlive-bin-parabola/PKGBUILD | 320 --------- .../fix-fontforge-encoding.patch | 12 - .../texlive-bin-parabola/luatex-poppler-0.20.patch | 77 --- .../luatex-r4449-radical-rule-thickness.patch | 23 - libre/texlive-bin-parabola/poppler-0.20.patch | 22 - libre/texlive-bin-parabola/poppler-0.26.patch | 104 --- libre/texlive-bin-parabola/texlive.install | 49 -- libre/texlive-bin-parabola/texmf.cnf | 724 --------------------- libre/texlive-bin/09-texlive-fonts.conf | 9 + libre/texlive-bin/PKGBUILD | 320 +++++++++ libre/texlive-bin/fix-fontforge-encoding.patch | 12 + libre/texlive-bin/luatex-poppler-0.20.patch | 77 +++ .../luatex-r4449-radical-rule-thickness.patch | 23 + libre/texlive-bin/poppler-0.20.patch | 22 + libre/texlive-bin/poppler-0.26.patch | 104 +++ libre/texlive-bin/texlive.install | 49 ++ libre/texlive-bin/texmf.cnf | 724 +++++++++++++++++++++ libre/usermin-parabola/PKGBUILD | 133 ---- libre/usermin-parabola/usermin.install | 34 - libre/usermin-parabola/usermin.service | 9 - libre/usermin/PKGBUILD | 131 ++++ libre/usermin/usermin.install | 34 + libre/usermin/usermin.service | 9 + libre/webmin-parabola/PKGBUILD | 220 ------- libre/webmin-parabola/webmin.install | 35 - libre/webmin-parabola/webmin.service | 11 - libre/webmin/PKGBUILD | 218 +++++++ libre/webmin/webmin.install | 35 + libre/webmin/webmin.service | 11 + libre/xorg-server-parabola/PKGBUILD | 145 ----- .../autoconfig-nvidia-libre.patch | 26 - libre/xorg-server-parabola/autoconfig-sis.patch | 21 - .../xorg-server-parabola/glamor-upstream-fix.patch | 178 ----- libre/xorg-server-parabola/xorg-server.install | 18 - libre/xorg-server-parabola/xvfb-run | 180 ----- libre/xorg-server-parabola/xvfb-run.1 | 282 -------- libre/xorg-server/PKGBUILD | 145 +++++ libre/xorg-server/autoconfig-nvidia-libre.patch | 26 + libre/xorg-server/autoconfig-sis.patch | 21 + libre/xorg-server/glamor-upstream-fix.patch | 178 +++++ libre/xorg-server/xorg-server.install | 18 + libre/xorg-server/xvfb-run | 180 +++++ libre/xorg-server/xvfb-run.1 | 282 ++++++++ libre/xsp-parabola/PKGBUILD | 62 -- libre/xsp-parabola/xsp.conf.d | 10 - libre/xsp-parabola/xsp.install | 37 -- libre/xsp-parabola/xsp.rc.d | 40 -- libre/xsp-parabola/xsp.service | 8 - libre/xsp-parabola/xsp.webapp | 8 - libre/xsp/PKGBUILD | 60 ++ libre/xsp/xsp.conf.d | 10 + libre/xsp/xsp.install | 37 ++ libre/xsp/xsp.rc.d | 40 ++ libre/xsp/xsp.service | 8 + libre/xsp/xsp.webapp | 8 + 354 files changed, 10619 insertions(+), 10692 deletions(-) delete mode 100644 libre/abs-parabola/PKGBUILD create mode 100644 libre/abs/PKGBUILD delete mode 100644 libre/audex-parabola/PKGBUILD delete mode 100644 libre/audex-parabola/audex.install delete mode 100644 libre/audex-parabola/google_regex.patch create mode 100644 libre/audex/PKGBUILD create mode 100644 libre/audex/audex.install create mode 100644 libre/audex/google_regex.patch delete mode 100644 libre/audio-convert-parabola/ChangeLog delete mode 100644 libre/audio-convert-parabola/PKGBUILD create mode 100644 libre/audio-convert/ChangeLog create mode 100644 libre/audio-convert/PKGBUILD delete mode 100644 libre/avidemux-parabola/PKGBUILD delete mode 100644 libre/avidemux-parabola/PKGBUILD.WIP delete mode 100644 libre/avidemux-parabola/avidemux.install create mode 100644 libre/avidemux/PKGBUILD create mode 100644 libre/avidemux/PKGBUILD.WIP create mode 100644 libre/avidemux/avidemux.install delete mode 100644 libre/bfgminer-parabola/PKGBUILD delete mode 100644 libre/bfgminer-parabola/change-kernel-path.patch delete mode 100644 libre/bfgminer-parabola/remove-dangerous-rpath.patch create mode 100644 libre/bfgminer/PKGBUILD create mode 100644 libre/bfgminer/change-kernel-path.patch create mode 100644 libre/bfgminer/remove-dangerous-rpath.patch delete mode 100644 libre/bitlbee-parabola/PKGBUILD delete mode 100644 libre/bitlbee-parabola/bitlbee.install delete mode 100644 libre/bitlbee-parabola/bitlbee.tmpfiles create mode 100644 libre/bitlbee/PKGBUILD create mode 100644 libre/bitlbee/bitlbee.install create mode 100644 libre/bitlbee/bitlbee.tmpfiles delete mode 100644 libre/cups-filters-parabola/PKGBUILD delete mode 100644 libre/cups-filters-parabola/cups-browsed.service delete mode 100644 libre/cups-filters-parabola/poppler_buildfix.diff create mode 100644 libre/cups-filters/PKGBUILD create mode 100644 libre/cups-filters/cups-browsed.service create mode 100644 libre/cups-filters/poppler_buildfix.diff delete mode 100644 libre/ecasound-parabola/PKGBUILD delete mode 100644 libre/ecasound-parabola/ruby2.patch create mode 100644 libre/ecasound/PKGBUILD create mode 100644 libre/ecasound/ruby2.patch delete mode 100644 libre/engrampa-parabola/PKGBUILD delete mode 100644 libre/engrampa-parabola/engrampa.install delete mode 100644 libre/engrampa-parabola/fr-rpm-bsdtar.patch create mode 100644 libre/engrampa/PKGBUILD create mode 100644 libre/engrampa/engrampa.install create mode 100644 libre/engrampa/fr-rpm-bsdtar.patch delete mode 100644 libre/file-roller-parabola/PKGBUILD delete mode 100644 libre/file-roller-parabola/bug708854.patch delete mode 100644 libre/file-roller-parabola/bug709035.patch delete mode 100644 libre/file-roller-parabola/file-roller.install delete mode 100644 libre/file-roller-parabola/rePKGBUILD create mode 100644 libre/file-roller/PKGBUILD create mode 100644 libre/file-roller/bug708854.patch create mode 100644 libre/file-roller/bug709035.patch create mode 100644 libre/file-roller/file-roller.install create mode 100644 libre/file-roller/rePKGBUILD delete mode 100644 libre/filesystem-parabola/PKGBUILD delete mode 100644 libre/filesystem-parabola/crypttab delete mode 100644 libre/filesystem-parabola/filesystem.install delete mode 100644 libre/filesystem-parabola/fstab delete mode 100644 libre/filesystem-parabola/group delete mode 100644 libre/filesystem-parabola/gshadow delete mode 100644 libre/filesystem-parabola/host.conf delete mode 100644 libre/filesystem-parabola/hosts delete mode 100644 libre/filesystem-parabola/issue delete mode 100644 libre/filesystem-parabola/ld.so.conf delete mode 100644 libre/filesystem-parabola/locale.sh delete mode 100644 libre/filesystem-parabola/modprobe.d.usb-load-ehci-first delete mode 100644 libre/filesystem-parabola/motd delete mode 100644 libre/filesystem-parabola/nsswitch.conf delete mode 100644 libre/filesystem-parabola/os-release delete mode 100644 libre/filesystem-parabola/parabola.7.txt delete mode 100644 libre/filesystem-parabola/passwd delete mode 100644 libre/filesystem-parabola/profile delete mode 100644 libre/filesystem-parabola/resolv.conf delete mode 100644 libre/filesystem-parabola/securetty delete mode 100644 libre/filesystem-parabola/shadow delete mode 100644 libre/filesystem-parabola/shells create mode 100644 libre/filesystem/PKGBUILD create mode 100644 libre/filesystem/crypttab create mode 100644 libre/filesystem/filesystem.install create mode 100644 libre/filesystem/fstab create mode 100644 libre/filesystem/group create mode 100644 libre/filesystem/gshadow create mode 100644 libre/filesystem/host.conf create mode 100644 libre/filesystem/hosts create mode 100644 libre/filesystem/issue create mode 100644 libre/filesystem/ld.so.conf create mode 100644 libre/filesystem/locale.sh create mode 100644 libre/filesystem/modprobe.d.usb-load-ehci-first create mode 100644 libre/filesystem/motd create mode 100644 libre/filesystem/nsswitch.conf create mode 100644 libre/filesystem/os-release create mode 100644 libre/filesystem/parabola.7.txt create mode 100644 libre/filesystem/passwd create mode 100644 libre/filesystem/profile create mode 100644 libre/filesystem/resolv.conf create mode 100644 libre/filesystem/securetty create mode 100644 libre/filesystem/shadow create mode 100644 libre/filesystem/shells delete mode 100644 libre/gnormalize-parabola/PKGBUILD delete mode 100644 libre/gnormalize-parabola/gnormalize.desktop delete mode 100644 libre/gnormalize-parabola/gnormalize.install create mode 100644 libre/gnormalize/PKGBUILD create mode 100644 libre/gnormalize/gnormalize.desktop create mode 100644 libre/gnormalize/gnormalize.install delete mode 100644 libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch delete mode 100644 libre/grub-parabola/09_parabola delete mode 100644 libre/grub-parabola/60_memtest86+ delete mode 100644 libre/grub-parabola/PKGBUILD delete mode 100644 libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch delete mode 100644 libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch delete mode 100644 libre/grub-parabola/grub-2.00-fix-docs.patch delete mode 100644 libre/grub-parabola/grub-2.00-mkinitcpio-0.15.patch delete mode 100644 libre/grub-parabola/grub-2.00.5086-fix-lvm-parsing.patch delete mode 100644 libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch delete mode 100644 libre/grub-parabola/grub.default delete mode 100644 libre/grub-parabola/grub.install delete mode 100644 libre/grub-parabola/parabola_grub_mkconfig_fixes.patch create mode 100644 libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch create mode 100644 libre/grub/09_parabola create mode 100644 libre/grub/60_memtest86+ create mode 100644 libre/grub/PKGBUILD create mode 100644 libre/grub/grub-10_linux-detect-parabola-initramfs.patch create mode 100644 libre/grub/grub-10_linux-rebrand-free-distros.patch create mode 100644 libre/grub/grub-2.00-fix-docs.patch create mode 100644 libre/grub/grub-2.00-mkinitcpio-0.15.patch create mode 100644 libre/grub/grub-2.00.5086-fix-lvm-parsing.patch create mode 100644 libre/grub/grub-add-GRUB_COLOR_variables.patch create mode 100644 libre/grub/grub.default create mode 100644 libre/grub/grub.install create mode 100644 libre/grub/parabola_grub_mkconfig_fixes.patch delete mode 100644 libre/gst-plugins-bad-parabola/PKGBUILD create mode 100644 libre/gst-plugins-bad/PKGBUILD delete mode 100644 libre/gstreamer0.10-bad-parabola/PKGBUILD delete mode 100644 libre/gstreamer0.10-bad-parabola/disable-assrender-test.patch delete mode 100644 libre/gstreamer0.10-bad-parabola/disable-camerabin-test.patch delete mode 100644 libre/gstreamer0.10-bad-parabola/gstreamer0.10-bad-plugins.install create mode 100644 libre/gstreamer0.10-bad/PKGBUILD create mode 100644 libre/gstreamer0.10-bad/disable-assrender-test.patch create mode 100644 libre/gstreamer0.10-bad/disable-camerabin-test.patch create mode 100644 libre/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install delete mode 100644 libre/gummiboot-parabola/PKGBUILD delete mode 100644 libre/gummiboot-parabola/gummiboot.install delete mode 100644 libre/gummiboot-parabola/loader.conf delete mode 100644 libre/gummiboot-parabola/parabola.conf delete mode 100644 libre/gummiboot-parabola/splash-parabola.bmp create mode 100644 libre/gummiboot/PKGBUILD create mode 100644 libre/gummiboot/gummiboot.install create mode 100644 libre/gummiboot/loader.conf create mode 100644 libre/gummiboot/parabola.conf create mode 100644 libre/gummiboot/splash-parabola.bmp delete mode 100644 libre/hardinfo-parabola/PKGBUILD delete mode 100644 libre/hardinfo-parabola/fixsensors.patch delete mode 100644 libre/hardinfo-parabola/hardinfo.distro create mode 100644 libre/hardinfo/PKGBUILD create mode 100644 libre/hardinfo/fixsensors.patch create mode 100644 libre/hardinfo/hardinfo.distro delete mode 100644 libre/libquicktime-parabola/PKGBUILD delete mode 100644 libre/libquicktime-parabola/ffmpeg2.0.patch create mode 100644 libre/libquicktime/PKGBUILD create mode 100644 libre/libquicktime/ffmpeg2.0.patch delete mode 100644 libre/lsb-release-parabola/PKGBUILD delete mode 100644 libre/lsb-release-parabola/lsb-release.install delete mode 100644 libre/lsb-release-parabola/lsb_release_description.patch create mode 100644 libre/lsb-release/PKGBUILD create mode 100644 libre/lsb-release/lsb-release.install create mode 100644 libre/lsb-release/lsb_release_description.patch delete mode 100644 libre/luxrays-parabola/PKGBUILD delete mode 100644 libre/luxrays-parabola/QTBUG-22829.diff delete mode 100644 libre/luxrays-parabola/luxmark_scenes_path.diff create mode 100644 libre/luxrays/PKGBUILD create mode 100644 libre/luxrays/QTBUG-22829.diff create mode 100644 libre/luxrays/luxmark_scenes_path.diff delete mode 100644 libre/luxrender-parabola/PKGBUILD delete mode 100644 libre/luxrender-parabola/force_python3.diff create mode 100644 libre/luxrender/PKGBUILD create mode 100644 libre/luxrender/force_python3.diff delete mode 100644 libre/mkisolinux-parabola/PKGBUILD delete mode 100644 libre/mkisolinux-parabola/boot.msg delete mode 100755 libre/mkisolinux-parabola/mkisolinux delete mode 100644 libre/mkisolinux-parabola/mkisolinux.conf delete mode 100644 libre/mkisolinux-parabola/options.msg create mode 100644 libre/mkisolinux/PKGBUILD create mode 100644 libre/mkisolinux/boot.msg create mode 100755 libre/mkisolinux/mkisolinux create mode 100644 libre/mkisolinux/mkisolinux.conf create mode 100644 libre/mkisolinux/options.msg delete mode 100644 libre/mkpxelinux-parabola/PKGBUILD delete mode 100644 libre/mkpxelinux-parabola/boot.msg delete mode 100755 libre/mkpxelinux-parabola/mkpxelinux delete mode 100644 libre/mkpxelinux-parabola/mkpxelinux.conf delete mode 100644 libre/mkpxelinux-parabola/options.msg create mode 100644 libre/mkpxelinux/PKGBUILD create mode 100644 libre/mkpxelinux/boot.msg create mode 100755 libre/mkpxelinux/mkpxelinux create mode 100644 libre/mkpxelinux/mkpxelinux.conf create mode 100644 libre/mkpxelinux/options.msg delete mode 100644 libre/mksyslinux-parabola/PKGBUILD delete mode 100644 libre/mksyslinux-parabola/boot.msg delete mode 100755 libre/mksyslinux-parabola/mksyslinux delete mode 100644 libre/mksyslinux-parabola/mksyslinux.conf delete mode 100644 libre/mksyslinux-parabola/options.msg create mode 100644 libre/mksyslinux/PKGBUILD create mode 100644 libre/mksyslinux/boot.msg create mode 100755 libre/mksyslinux/mksyslinux create mode 100644 libre/mksyslinux/mksyslinux.conf create mode 100644 libre/mksyslinux/options.msg delete mode 100644 libre/mplayer-parabola/PKGBUILD delete mode 100644 libre/mplayer-parabola/cdio-includes.patch delete mode 100644 libre/mplayer-parabola/giflib51.patch delete mode 100644 libre/mplayer-parabola/include-samba-4.0.patch delete mode 100644 libre/mplayer-parabola/mplayer.desktop delete mode 100644 libre/mplayer-parabola/mplayer.install delete mode 100644 libre/mplayer-parabola/mplayer.png delete mode 100644 libre/mplayer-parabola/revert-icl-fixes.patch delete mode 100644 libre/mplayer-vaapi-parabola/PKGBUILD delete mode 100644 libre/mplayer-vaapi-parabola/cdio-includes.patch delete mode 100644 libre/mplayer-vaapi-parabola/include-samba-4.0.patch delete mode 100644 libre/mplayer-vaapi-parabola/mplayer-vaapi.install delete mode 100644 libre/mplayer-vaapi-parabola/subreader-fix-srt-parsing.patch delete mode 100644 libre/mplayer-vaapi-parabola/tweak-desktop-file.patch create mode 100644 libre/mplayer-vaapi/PKGBUILD create mode 100644 libre/mplayer-vaapi/cdio-includes.patch create mode 100644 libre/mplayer-vaapi/include-samba-4.0.patch create mode 100644 libre/mplayer-vaapi/mplayer-vaapi.install create mode 100644 libre/mplayer-vaapi/subreader-fix-srt-parsing.patch create mode 100644 libre/mplayer-vaapi/tweak-desktop-file.patch create mode 100644 libre/mplayer/PKGBUILD create mode 100644 libre/mplayer/cdio-includes.patch create mode 100644 libre/mplayer/giflib51.patch create mode 100644 libre/mplayer/include-samba-4.0.patch create mode 100644 libre/mplayer/mplayer.desktop create mode 100644 libre/mplayer/mplayer.install create mode 100644 libre/mplayer/mplayer.png create mode 100644 libre/mplayer/revert-icl-fixes.patch delete mode 100644 libre/nss-parabola/PKGBUILD delete mode 100644 libre/nss-parabola/add_cacert_ca_certs.patch delete mode 100644 libre/nss-parabola/nss-config.in delete mode 100644 libre/nss-parabola/nss.pc.in delete mode 100644 libre/nss-parabola/ssl-renegotiate-transitional.patch create mode 100644 libre/nss/PKGBUILD create mode 100644 libre/nss/add_cacert_ca_certs.patch create mode 100644 libre/nss/nss-config.in create mode 100644 libre/nss/nss.pc.in create mode 100644 libre/nss/ssl-renegotiate-transitional.patch delete mode 100644 libre/ogmrip-parabola/PKGBUILD delete mode 100644 libre/ogmrip-parabola/ogmrip.changelog delete mode 100644 libre/ogmrip-parabola/ogmrip.install create mode 100644 libre/ogmrip/PKGBUILD create mode 100644 libre/ogmrip/ogmrip.changelog create mode 100644 libre/ogmrip/ogmrip.install delete mode 100644 libre/openshot-parabola/PKGBUILD delete mode 100644 libre/openshot-parabola/openshot.install create mode 100644 libre/openshot/PKGBUILD create mode 100644 libre/openshot/openshot.install delete mode 100644 libre/pacman-mirrorlist-parabola/PKGBUILD create mode 100644 libre/pacman-mirrorlist/PKGBUILD delete mode 100644 libre/psi-parabola/PKGBUILD delete mode 100644 libre/psi-parabola/parabola.patch delete mode 100644 libre/psi-parabola/psi.install create mode 100644 libre/psi/PKGBUILD create mode 100644 libre/psi/parabola.patch create mode 100644 libre/psi/psi.install delete mode 100644 libre/reflector-parabola/PKGBUILD delete mode 100644 libre/reflector-parabola/rebranding.patch create mode 100644 libre/reflector/PKGBUILD create mode 100644 libre/reflector/rebranding.patch delete mode 100644 libre/soundkonverter-parabola/PKGBUILD delete mode 100644 libre/soundkonverter-parabola/soundkonverter.install create mode 100644 libre/soundkonverter/PKGBUILD create mode 100644 libre/soundkonverter/soundkonverter.install delete mode 100644 libre/spectrwm-parabola/LICENSE delete mode 100644 libre/spectrwm-parabola/PKGBUILD delete mode 100644 libre/spectrwm-parabola/baraction.sh delete mode 100644 libre/spectrwm-parabola/spectrwm-no-preload create mode 100644 libre/spectrwm/LICENSE create mode 100644 libre/spectrwm/PKGBUILD create mode 100644 libre/spectrwm/baraction.sh create mode 100644 libre/spectrwm/spectrwm-no-preload delete mode 100644 libre/syslinux-parabola/PKGBUILD delete mode 100644 libre/syslinux-parabola/splash.png delete mode 100644 libre/syslinux-parabola/splash.xcf delete mode 100644 libre/syslinux-parabola/syslinux-6.02-fix-bios-isolinux.patch delete mode 100644 libre/syslinux-parabola/syslinux-6.02-fix-chainloading.patch delete mode 100644 libre/syslinux-parabola/syslinux-6.02-fix-efi-ovmf.patch delete mode 100644 libre/syslinux-parabola/syslinux-install_update delete mode 100644 libre/syslinux-parabola/syslinux.cfg delete mode 100644 libre/syslinux-parabola/syslinux.install create mode 100644 libre/syslinux/PKGBUILD create mode 100644 libre/syslinux/splash.png create mode 100644 libre/syslinux/splash.xcf create mode 100644 libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch create mode 100644 libre/syslinux/syslinux-6.02-fix-chainloading.patch create mode 100644 libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch create mode 100644 libre/syslinux/syslinux-install_update create mode 100644 libre/syslinux/syslinux.cfg create mode 100644 libre/syslinux/syslinux.install delete mode 100644 libre/texlive-bin-parabola/09-texlive-fonts.conf delete mode 100644 libre/texlive-bin-parabola/PKGBUILD delete mode 100644 libre/texlive-bin-parabola/fix-fontforge-encoding.patch delete mode 100644 libre/texlive-bin-parabola/luatex-poppler-0.20.patch delete mode 100644 libre/texlive-bin-parabola/luatex-r4449-radical-rule-thickness.patch delete mode 100644 libre/texlive-bin-parabola/poppler-0.20.patch delete mode 100644 libre/texlive-bin-parabola/poppler-0.26.patch delete mode 100644 libre/texlive-bin-parabola/texlive.install delete mode 100644 libre/texlive-bin-parabola/texmf.cnf create mode 100644 libre/texlive-bin/09-texlive-fonts.conf create mode 100644 libre/texlive-bin/PKGBUILD create mode 100644 libre/texlive-bin/fix-fontforge-encoding.patch create mode 100644 libre/texlive-bin/luatex-poppler-0.20.patch create mode 100644 libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch create mode 100644 libre/texlive-bin/poppler-0.20.patch create mode 100644 libre/texlive-bin/poppler-0.26.patch create mode 100644 libre/texlive-bin/texlive.install create mode 100644 libre/texlive-bin/texmf.cnf delete mode 100644 libre/usermin-parabola/PKGBUILD delete mode 100644 libre/usermin-parabola/usermin.install delete mode 100644 libre/usermin-parabola/usermin.service create mode 100644 libre/usermin/PKGBUILD create mode 100644 libre/usermin/usermin.install create mode 100644 libre/usermin/usermin.service delete mode 100644 libre/webmin-parabola/PKGBUILD delete mode 100644 libre/webmin-parabola/webmin.install delete mode 100644 libre/webmin-parabola/webmin.service create mode 100644 libre/webmin/PKGBUILD create mode 100644 libre/webmin/webmin.install create mode 100644 libre/webmin/webmin.service delete mode 100644 libre/xorg-server-parabola/PKGBUILD delete mode 100644 libre/xorg-server-parabola/autoconfig-nvidia-libre.patch delete mode 100644 libre/xorg-server-parabola/autoconfig-sis.patch delete mode 100644 libre/xorg-server-parabola/glamor-upstream-fix.patch delete mode 100644 libre/xorg-server-parabola/xorg-server.install delete mode 100644 libre/xorg-server-parabola/xvfb-run delete mode 100644 libre/xorg-server-parabola/xvfb-run.1 create mode 100644 libre/xorg-server/PKGBUILD create mode 100644 libre/xorg-server/autoconfig-nvidia-libre.patch create mode 100644 libre/xorg-server/autoconfig-sis.patch create mode 100644 libre/xorg-server/glamor-upstream-fix.patch create mode 100644 libre/xorg-server/xorg-server.install create mode 100644 libre/xorg-server/xvfb-run create mode 100644 libre/xorg-server/xvfb-run.1 delete mode 100644 libre/xsp-parabola/PKGBUILD delete mode 100644 libre/xsp-parabola/xsp.conf.d delete mode 100644 libre/xsp-parabola/xsp.install delete mode 100644 libre/xsp-parabola/xsp.rc.d delete mode 100644 libre/xsp-parabola/xsp.service delete mode 100644 libre/xsp-parabola/xsp.webapp create mode 100644 libre/xsp/PKGBUILD create mode 100644 libre/xsp/xsp.conf.d create mode 100644 libre/xsp/xsp.install create mode 100644 libre/xsp/xsp.rc.d create mode 100644 libre/xsp/xsp.service create mode 100644 libre/xsp/xsp.webapp diff --git a/libre/abs-parabola/PKGBUILD b/libre/abs-parabola/PKGBUILD deleted file mode 100644 index 5d6622b6f..000000000 --- a/libre/abs-parabola/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 215815 2014-06-30 16:27:03Z fyan $ -# Maintainer (Arch): Allan McRae - -_pkgname=abs -pkgname=abs-parabola -pkgver=2.4.4 -pkgrel=2 -pkgdesc="Utilities to download and work with the Arch Build System (ABS), with Parabola repos support" -arch=('i686' 'x86_64' 'mips64el') -url="http://projects.archlinux.org/abs.git/" -license=('GPL') -replaces=('abs' 'abs-libre') -conflicts=('abs' 'abs-libre') -provides=("abs=$pkgver") -depends=('bash' 'rsync') -backup=(etc/abs.conf) -source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' - 'a628f7d5b1cd1e838366b88709690c24') - -build() { - cd "$_pkgname-$pkgver" - - make -} - -package() { - cd "$_pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install - - # Add readme file, and make base /var/abs path - install -dm755 "${pkgdir}"/var/abs/local/ - install -Dm644 README "${pkgdir}"/var/abs/README - - # make adjustments to abs.conf - sed -i -e 's|i686 or x86_64|i686, x86_64 or mips64el|' "${pkgdir}"/etc/abs.conf - sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf - sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf - sed -i -e 's|!staging !community-staging !gnome-unstable !kde-unstable|!pcr !nonprism !kernels !cross !java !java-ugly !~smv !~xihh !~brendan !~lukeshu !~emulatorman !~aurelien !~jorginho !~coadde !~drtan|' "${pkgdir}"/etc/abs.conf - if [[ $CARCH != "x86_64" ]]; then - sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf - fi - if [[ $CARCH = "x86_64" ]]; then - sed -i -e 's|community|community libre-multilib|' -e 's|!community-testing|!community-testing !libre-multilib-testing|' "${pkgdir}"/etc/abs.conf - fi - sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf -} diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD new file mode 100644 index 000000000..e9f313c9c --- /dev/null +++ b/libre/abs/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 215815 2014-06-30 16:27:03Z fyan $ +# Maintainer (Arch): Allan McRae + +pkgname=abs +pkgver=2.4.4 +pkgrel=2.parabola1 +pkgdesc="Utilities to download and work with the Arch Build System (ABS), with Parabola repos support" +arch=('i686' 'x86_64' 'mips64el') +url="http://projects.archlinux.org/abs.git/" +license=('GPL') +replaces=('abs-libre' 'abs-parabola') +conflicts=('abs-libre' 'abs-parabola') +depends=('bash' 'rsync') +backup=(etc/abs.conf) +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' + 'a628f7d5b1cd1e838366b88709690c24') + +build() { + cd "$pkgname-$pkgver" + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install + + # Add readme file, and make base /var/abs path + install -dm755 "${pkgdir}"/var/abs/local/ + install -Dm644 README "${pkgdir}"/var/abs/README + + # make adjustments to abs.conf + sed -i -e 's|i686 or x86_64|i686, x86_64 or mips64el|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|!staging !community-staging !gnome-unstable !kde-unstable|!pcr !nonprism !kernels !cross !java !java-ugly !~smv !~xihh !~brendan !~lukeshu !~emulatorman !~aurelien !~jorginho !~coadde !~drtan|' "${pkgdir}"/etc/abs.conf + if [[ $CARCH != "x86_64" ]]; then + sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf + fi + if [[ $CARCH = "x86_64" ]]; then + sed -i -e 's|community|community libre-multilib|' -e 's|!community-testing|!community-testing !libre-multilib-testing|' "${pkgdir}"/etc/abs.conf + fi + sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf +} diff --git a/libre/audex-parabola/PKGBUILD b/libre/audex-parabola/PKGBUILD deleted file mode 100644 index 56ddcf3ec..000000000 --- a/libre/audex-parabola/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 106445 2014-03-03 14:51:50Z lcarlier $ -# Maintainer (Arch): Laurent Carlier -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): mightyjaym -# Contributor (Arch): moostik -# Maintainer: André Silva - -_pkgname=audex -pkgname=audex-parabola -pkgver=0.78 -pkgrel=1 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE, without nonfree faac recommendation" -arch=('i686' 'x86_64' 'mips64el') -url="http://kde-apps.org/content/show.php?content=77125" -license=('GPL') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') -makedepends=('cmake' 'automoc4') -optdepends=('vorbis-tools: OGG encoder' - 'flac: FLAC encoder' - 'lame: MP3 encoder') -install=${_pkgname}.install -source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz") -md5sums=('e424309ab085de40043f841f2fa230c6') - -build() { - cd ${_pkgname}-${pkgver} - - mkdir build - cd build - - cmake ../ \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${_pkgname}-${pkgver}/build - - make DESTDIR=${pkgdir} install -} diff --git a/libre/audex-parabola/audex.install b/libre/audex-parabola/audex.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/libre/audex-parabola/audex.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/audex-parabola/google_regex.patch b/libre/audex-parabola/google_regex.patch deleted file mode 100644 index 86917e66f..000000000 --- a/libre/audex-parabola/google_regex.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 -+++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 -@@ -162,7 +162,10 @@ - cover_tbnids.clear(); - cover_thumbnails.clear(); - -- QRegExp rx("[\\s\\n]*[\\s\\n]*"); -+ QRegExp rx("[\\s\\n]*]+src=\"([^>]+)\">"); -+ QString html = xml; -+ html.replace( QLatin1String("&"), QLatin1String("&") ); -+ - rx.setMinimal(TRUE); - - int pos = 0; int i = 0; diff --git a/libre/audex/PKGBUILD b/libre/audex/PKGBUILD new file mode 100644 index 000000000..0e2730eb6 --- /dev/null +++ b/libre/audex/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 106445 2014-03-03 14:51:50Z lcarlier $ +# Maintainer (Arch): Laurent Carlier +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): mightyjaym +# Contributor (Arch): moostik +# Maintainer: André Silva + +pkgname=audex +pkgver=0.78 +pkgrel=1.parabola1 +pkgdesc="A CDDA extraction tool with a ftp upload function for KDE, without nonfree faac recommendation" +arch=('i686' 'x86_64' 'mips64el') +url="http://kde-apps.org/content/show.php?content=77125" +license=('GPL') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') +makedepends=('cmake' 'automoc4') +optdepends=('vorbis-tools: OGG encoder' + 'flac: FLAC encoder' + 'lame: MP3 encoder') +install=${pkgname}.install +source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz") +md5sums=('e424309ab085de40043f841f2fa230c6') + +build() { + cd ${pkgname}-${pkgver} + + mkdir build + cd build + + cmake ../ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR=${pkgdir} install +} diff --git a/libre/audex/audex.install b/libre/audex/audex.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/libre/audex/audex.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/audex/google_regex.patch b/libre/audex/google_regex.patch new file mode 100644 index 000000000..86917e66f --- /dev/null +++ b/libre/audex/google_regex.patch @@ -0,0 +1,14 @@ +--- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 ++++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 +@@ -162,7 +162,10 @@ + cover_tbnids.clear(); + cover_thumbnails.clear(); + +- QRegExp rx("[\\s\\n]*[\\s\\n]*"); ++ QRegExp rx("[\\s\\n]*]+src=\"([^>]+)\">"); ++ QString html = xml; ++ html.replace( QLatin1String("&"), QLatin1String("&") ); ++ + rx.setMinimal(TRUE); + + int pos = 0; int i = 0; diff --git a/libre/audio-convert-parabola/ChangeLog b/libre/audio-convert-parabola/ChangeLog deleted file mode 100644 index 0d8720f38..000000000 --- a/libre/audio-convert-parabola/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2013-03-13 André Silva - * Remove nonfree faac recommendation - -2009-10-17 Jaroslav Lichtblau - * PKGBUILD syntax corrections diff --git a/libre/audio-convert-parabola/PKGBUILD b/libre/audio-convert-parabola/PKGBUILD deleted file mode 100644 index 62e218bc5..000000000 --- a/libre/audio-convert-parabola/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $ -# Maintainer (Arch): Jaroslav Lichtblau -# Contributor (Arch): Igor Galic -# Maintainer: André Silva - -_pkgname=audio-convert -pkgname=audio-convert-parabola -pkgver=0.3.1.1 -pkgrel=7 -pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation" -arch=('any') -url="http://freshmeat.net/projects/audio-convert" -license=('GPL') -depends=('bash' 'zenity') -optdepends=('faad2: for aac support' - 'flac: for flac support' - 'id3lib: for mp3 support' - 'lame: for mp3 support' - 'mplayer: for wma support' - 'musepack-tools: for mpc support' - 'vorbis-tools: for ogg support') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2) -sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b') - -package() { - install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname" - -#FS#29260 fix - sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname" -} diff --git a/libre/audio-convert/ChangeLog b/libre/audio-convert/ChangeLog new file mode 100644 index 000000000..0d8720f38 --- /dev/null +++ b/libre/audio-convert/ChangeLog @@ -0,0 +1,5 @@ +2013-03-13 André Silva + * Remove nonfree faac recommendation + +2009-10-17 Jaroslav Lichtblau + * PKGBUILD syntax corrections diff --git a/libre/audio-convert/PKGBUILD b/libre/audio-convert/PKGBUILD new file mode 100644 index 000000000..155151a4d --- /dev/null +++ b/libre/audio-convert/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $ +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Igor Galic +# Maintainer: André Silva + +pkgname=audio-convert +pkgver=0.3.1.1 +pkgrel=7.parabola1 +pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation" +arch=('any') +url="http://freshmeat.net/projects/audio-convert" +license=('GPL') +depends=('bash' 'zenity') +optdepends=('faad2: for aac support' + 'flac: for flac support' + 'id3lib: for mp3 support' + 'lame: for mp3 support' + 'mplayer: for wma support' + 'musepack-tools: for mpc support' + 'vorbis-tools: for ogg support') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b') + +package() { + install -D -m755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname" + +#FS#29260 fix + sed -i '46 s/^/#/' "$pkgdir/usr/bin/$pkgname" +} diff --git a/libre/avidemux-parabola/PKGBUILD b/libre/avidemux-parabola/PKGBUILD deleted file mode 100644 index 0a1d76cf4..000000000 --- a/libre/avidemux-parabola/PKGBUILD +++ /dev/null @@ -1,124 +0,0 @@ -# $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $ -# Maintainer (Arch): Eric Bélanger -# Maintainer: André Silva - -pkgbase=avidemux -pkgname=('avidemux-cli-parabola' 'avidemux-gtk-parabola' 'avidemux-qt-parabola') -pkgver=2.5.6 -pkgrel=9 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') -options=('!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') - -build() { - cd ${pkgbase}_${pkgver} - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ - -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. - make - -# plugin build expects libraries to be already installed; we fake a prefix -# in build/ by symlinking all libraries to build/lib/ - cd lib - find ../avidemux -name '*.so*' | xargs ln -sft . - cd ../../plugins - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ - -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ - -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ - -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. - make -} - -package_avidemux-cli-parabola() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin') - provides=('avidemux' "avidemux-cli=$pkgver") - conflicts=('avidemux' 'avidemux-cli' 'avidemux-libre-cli') - replaces=('avidemux' 'avidemux-cli' 'avidemux-libre-cli') - - cd ${pkgbase}_${pkgver}/build - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/share/avidemux - rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll} - rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} - rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so - - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" - - install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-gtk-parabola() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" - depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') - replaces=('avidemux-gtk' 'avidemux-libre-gtk') - conflicts=('avidemux-gtk' 'avidemux-libre-gtk') - provides=("avidemux-gtk=$pkgver") - install=avidemux.install - - cd ${pkgbase}_${pkgver} - install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" - - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" -} - -package_avidemux-qt-parabola() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support" - depends=("avidemux-cli=${pkgver}" 'qt4') - replaces=('avidemux-qt' 'avidemux-libre-qt') - conflicts=('avidemux-qt' 'avidemux-libre-qt') - provides=("avidemux-qt=$pkgver") - install=avidemux.install - - cd ${pkgbase}_${pkgver} - install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -d "${pkgdir}/usr/share/avidemux/i18n" - install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" -} diff --git a/libre/avidemux-parabola/PKGBUILD.WIP b/libre/avidemux-parabola/PKGBUILD.WIP deleted file mode 100644 index c79fb90e9..000000000 --- a/libre/avidemux-parabola/PKGBUILD.WIP +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ -# Maintainer (Arch): Eric Bélanger -# Maintainer: André Silva - -_pkgbase=avidemux -pkgbase=avidemux-libre -pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') -pkgver=2.6.8 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ - 'libvdpau' 'libdca' 'fribidi' 'glu') -options=('!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('50f3dfe270e6272fce46d725b198b9d0dd95664b') -#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) -#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') - -prepare() { -# mv 2.6_snapshot ${_pkgbase}_${pkgver} - cd ${_pkgbase}_${pkgver} - sed -i 's|avidemux2|avidemux3|' avidemux2.desktop - sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash - sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp -} - -build() { - cd ${_pkgbase}_${pkgver} - bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins -} - -package_avidemux-libre-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin' - 'qt4: for the QtScript scripting support' - 'libdca: for the corresponding audio decoder plugin' - 'fribidi: for the corresponding video filter plugin') - provides=('avidemux' 'avidemux-cli') - conflicts=('avidemux' 'avidemux-cli') - replaces=('avidemux' "avidemux-cli=$pkgver") - - cd ${_pkgbase}_${pkgver} - (cd buildCli; make DESTDIR="${pkgdir}" install) - (cd buildCore; make DESTDIR="${pkgdir}" install) - (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) - (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) - - install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-libre-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" - depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') - replaces=('avidemux-gtk') - conflicts=('avidemux-gtk') - provides=("avidemux-gtk=$pkgver") - install=avidemux.install - - cd ${_pkgbase}_${pkgver} - (cd buildGtk; make DESTDIR="${pkgdir}" install) - (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - - rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" -} - -package_avidemux-libre-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support" - depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu') - replaces=('avidemux-qt') - conflicts=('avidemux-qt') - provides=("avidemux-qt=$pkgver") - install=avidemux.install - - cd ${_pkgbase}_${pkgver} - (cd buildQt4; make DESTDIR="${pkgdir}" install) - (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" -} diff --git a/libre/avidemux-parabola/avidemux.install b/libre/avidemux-parabola/avidemux.install deleted file mode 100644 index e111ef946..000000000 --- a/libre/avidemux-parabola/avidemux.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/avidemux/PKGBUILD b/libre/avidemux/PKGBUILD new file mode 100644 index 000000000..9b17d4043 --- /dev/null +++ b/libre/avidemux/PKGBUILD @@ -0,0 +1,122 @@ +# $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $ +# Maintainer (Arch): Eric Bélanger +# Maintainer: André Silva + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.6 +pkgrel=9.parabola1 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') +options=('!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') + +build() { + cd ${pkgbase}_${pkgver} + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ + -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ + -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux' 'avidemux-libre-cli' 'avidemux-cli-parabola') + replaces=('avidemux' 'avidemux-libre-cli' 'avidemux-cli-parabola') + + cd ${pkgbase}_${pkgver}/build + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll} + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + replaces=('avidemux-libre-gtk' 'avidemux-gtk-parabola') + conflicts=('avidemux-libre-gtk' 'avidemux-gtk-parabola') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support" + depends=("avidemux-cli=${pkgver}" 'qt4') + replaces=('avidemux-libre-qt' 'avidemux-qt-parabola') + conflicts=('avidemux-libre-qt' 'avidemux-qt-parabola') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/libre/avidemux/PKGBUILD.WIP b/libre/avidemux/PKGBUILD.WIP new file mode 100644 index 000000000..c79fb90e9 --- /dev/null +++ b/libre/avidemux/PKGBUILD.WIP @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ +# Maintainer (Arch): Eric Bélanger +# Maintainer: André Silva + +_pkgbase=avidemux +pkgbase=avidemux-libre +pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') +pkgver=2.6.8 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL2') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ + 'libvdpau' 'libdca' 'fribidi' 'glu') +options=('!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('50f3dfe270e6272fce46d725b198b9d0dd95664b') +#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) +#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') + +prepare() { +# mv 2.6_snapshot ${_pkgbase}_${pkgver} + cd ${_pkgbase}_${pkgver} + sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { + cd ${_pkgbase}_${pkgver} + bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins +} + +package_avidemux-libre-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin' + 'qt4: for the QtScript scripting support' + 'libdca: for the corresponding audio decoder plugin' + 'fribidi: for the corresponding video filter plugin') + provides=('avidemux' 'avidemux-cli') + conflicts=('avidemux' 'avidemux-cli') + replaces=('avidemux' "avidemux-cli=$pkgver") + + cd ${_pkgbase}_${pkgver} + (cd buildCli; make DESTDIR="${pkgdir}" install) + (cd buildCore; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-libre-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + replaces=('avidemux-gtk') + conflicts=('avidemux-gtk') + provides=("avidemux-gtk=$pkgver") + install=avidemux.install + + cd ${_pkgbase}_${pkgver} + (cd buildGtk; make DESTDIR="${pkgdir}" install) + (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + + rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" +} + +package_avidemux-libre-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu') + replaces=('avidemux-qt') + conflicts=('avidemux-qt') + provides=("avidemux-qt=$pkgver") + install=avidemux.install + + cd ${_pkgbase}_${pkgver} + (cd buildQt4; make DESTDIR="${pkgdir}" install) + (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/libre/avidemux/avidemux.install b/libre/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/libre/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/bfgminer-parabola/PKGBUILD b/libre/bfgminer-parabola/PKGBUILD deleted file mode 100644 index 51fbc80a4..000000000 --- a/libre/bfgminer-parabola/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 117772 2014-08-22 15:36:25Z fyan $ -# Maintainer (Arch): Timothy Redaelli -# Contributor (Arch): Andy Weidenbaum - -_pkgname=bfgminer -pkgname=bfgminer-parabola -pkgver=4.7.0 -pkgrel=1 -pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation" -arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') -makedepends=('uthash' 'yasm') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=("${_pkgname}=$pkgver") -url='http://bfgminer.org/' -license=('GPL3') -source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz - remove-dangerous-rpath.patch) -sha256sums=('044636103f2c399d8c0290e6642ef896cff43de3c025d99a1465e670337aeb0a' - 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') - -prepare() { - cd "$srcdir"/$_pkgname-$pkgver - - patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch - NOSUBMODULES=1 ./autogen.sh -} - -build() { - cd "$srcdir"/$_pkgname-$pkgver - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --enable-cpumining \ - --enable-bfsb \ - --enable-metabank \ - --enable-scrypt \ - --disable-opencl \ - --with-udevrulesdir=/usr/lib/udev/rules.d - # --enable-knc (FS#33640) - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - - make DESTDIR="$pkgdir" install -} diff --git a/libre/bfgminer-parabola/change-kernel-path.patch b/libre/bfgminer-parabola/change-kernel-path.patch deleted file mode 100644 index 9dd124ab4..000000000 --- a/libre/bfgminer-parabola/change-kernel-path.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- /dev/null -+++ m4/as-ac-expand.m4 -@@ -0,0 +1,49 @@ -+dnl as-ac-expand.m4 0.2.1 -+dnl autostars m4 macro for expanding directories using configure's prefix -+dnl thomas@apestaart.org -+ -+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -+dnl example -+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local -+dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE -+dnl by calling it like this: -+dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") -+ -+AC_DEFUN([AS_AC_EXPAND], -+[ -+ EXP_VAR=[$1] -+ FROM_VAR=[$2] -+ -+ dnl echo DEBUG: expand FROM_VAR $FROM_VAR -+ -+ dnl first expand prefix and exec_prefix if necessary -+ prefix_save=$prefix -+ exec_prefix_save=$exec_prefix -+ -+ dnl if no prefix given, then use /usr/local, the default prefix -+ if test "x$prefix" = "xNONE"; then -+ prefix="$ac_default_prefix" -+ fi -+ dnl if no exec_prefix given, then use prefix -+ if test "x$exec_prefix" = "xNONE"; then -+ exec_prefix=$prefix -+ fi -+ -+ full_var="$FROM_VAR" -+ dnl loop until it doesn't change anymore -+ while true; do -+ dnl echo DEBUG: full_var: $full_var -+ new_full_var="`eval echo $full_var`" -+ if test "x$new_full_var" = "x$full_var"; then break; fi -+ full_var=$new_full_var -+ done -+ -+ dnl clean up -+ full_var=$new_full_var -+ AC_SUBST([$1], "$full_var") -+ -+ dnl restore prefix and exec_prefix -+ prefix=$prefix_save -+ exec_prefix=$exec_prefix_save -+]) ---- configure.ac.orig -+++ configure.ac -@@ -655,7 +655,8 @@ - prefix=/usr/local - fi - --AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install]) -+AS_AC_EXPAND(DATAROOTDIR, $datarootdir) -+AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$DATAROOTDIR/bfgminer"], [Path to bfgminer install]) - - AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel]) - AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm121016"], [Filename for poclbm kernel]) ---- Makefile.am.orig -+++ Makefile.am -@@ -13,7 +13,7 @@ - - bin_PROGRAMS = bfgminer - --bin_SCRIPTS = *.cl -+pkgdata_SCRIPTS = *.cl - - bfgminer_LDFLAGS = $(PTHREAD_FLAGS) - bfgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \ -@@ -117,19 +117,19 @@ - - if HAS_MODMINER - bfgminer_SOURCES += driver-modminer.c --bitstreamsdir = $(bindir)/bitstreams -+bitstreamsdir = $(pkgdatadir)/bitstreams - dist_bitstreams_DATA = bitstreams/* - endif - - if HAS_X6500 - bfgminer_SOURCES += driver-x6500.c ft232r.c ft232r.h jtag.c jtag.h --bitstreamsdir = $(bindir)/bitstreams -+bitstreamsdir = $(pkgdatadir)/bitstreams - dist_bitstreams_DATA = bitstreams/* - endif - - if HAS_ZTEX - bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h --bitstreamsdir = $(bindir)/bitstreams -+bitstreamsdir = $(pkgdatadir)/bitstreams - dist_bitstreams_DATA = bitstreams/* - endif - diff --git a/libre/bfgminer-parabola/remove-dangerous-rpath.patch b/libre/bfgminer-parabola/remove-dangerous-rpath.patch deleted file mode 100644 index abd815141..000000000 --- a/libre/bfgminer-parabola/remove-dangerous-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig -+++ configure.ac -@@ -514,7 +514,7 @@ - ]) - else - libblkmaker_CFLAGS='-Ilibblkmaker' -- libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS" -+ libblkmaker_LDFLAGS='-Llibblkmaker/.libs' - libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1' - AC_CONFIG_SUBDIRS([libblkmaker]) - fi diff --git a/libre/bfgminer/PKGBUILD b/libre/bfgminer/PKGBUILD new file mode 100644 index 000000000..1a1508af8 --- /dev/null +++ b/libre/bfgminer/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 117772 2014-08-22 15:36:25Z fyan $ +# Maintainer (Arch): Timothy Redaelli +# Contributor (Arch): Andy Weidenbaum + +pkgname=bfgminer +pkgver=4.7.0 +pkgrel=1.parabola1 +pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation" +arch=('i686' 'x86_64' 'mips64el') +depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') +makedepends=('uthash' 'yasm') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +url='http://bfgminer.org/' +license=('GPL3') +source=(http://luke.dashjr.org/programs/bitcoin/files/$pkgname/$pkgver/$pkgname-$pkgver.txz + remove-dangerous-rpath.patch) +sha256sums=('044636103f2c399d8c0290e6642ef896cff43de3c025d99a1465e670337aeb0a' + 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + + patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch + NOSUBMODULES=1 ./autogen.sh +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --enable-cpumining \ + --enable-bfsb \ + --enable-metabank \ + --enable-scrypt \ + --disable-opencl \ + --with-udevrulesdir=/usr/lib/udev/rules.d + # --enable-knc (FS#33640) + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/libre/bfgminer/change-kernel-path.patch b/libre/bfgminer/change-kernel-path.patch new file mode 100644 index 000000000..9dd124ab4 --- /dev/null +++ b/libre/bfgminer/change-kernel-path.patch @@ -0,0 +1,98 @@ +--- /dev/null ++++ m4/as-ac-expand.m4 +@@ -0,0 +1,49 @@ ++dnl as-ac-expand.m4 0.2.1 ++dnl autostars m4 macro for expanding directories using configure's prefix ++dnl thomas@apestaart.org ++ ++dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) ++dnl example ++dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) ++dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local ++dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE ++dnl by calling it like this: ++dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") ++ ++AC_DEFUN([AS_AC_EXPAND], ++[ ++ EXP_VAR=[$1] ++ FROM_VAR=[$2] ++ ++ dnl echo DEBUG: expand FROM_VAR $FROM_VAR ++ ++ dnl first expand prefix and exec_prefix if necessary ++ prefix_save=$prefix ++ exec_prefix_save=$exec_prefix ++ ++ dnl if no prefix given, then use /usr/local, the default prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix="$ac_default_prefix" ++ fi ++ dnl if no exec_prefix given, then use prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++ fi ++ ++ full_var="$FROM_VAR" ++ dnl loop until it doesn't change anymore ++ while true; do ++ dnl echo DEBUG: full_var: $full_var ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var" = "x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ dnl clean up ++ full_var=$new_full_var ++ AC_SUBST([$1], "$full_var") ++ ++ dnl restore prefix and exec_prefix ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++]) +--- configure.ac.orig ++++ configure.ac +@@ -655,7 +655,8 @@ + prefix=/usr/local + fi + +-AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install]) ++AS_AC_EXPAND(DATAROOTDIR, $datarootdir) ++AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$DATAROOTDIR/bfgminer"], [Path to bfgminer install]) + + AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel]) + AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm121016"], [Filename for poclbm kernel]) +--- Makefile.am.orig ++++ Makefile.am +@@ -13,7 +13,7 @@ + + bin_PROGRAMS = bfgminer + +-bin_SCRIPTS = *.cl ++pkgdata_SCRIPTS = *.cl + + bfgminer_LDFLAGS = $(PTHREAD_FLAGS) + bfgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \ +@@ -117,19 +117,19 @@ + + if HAS_MODMINER + bfgminer_SOURCES += driver-modminer.c +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_X6500 + bfgminer_SOURCES += driver-x6500.c ft232r.c ft232r.h jtag.c jtag.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + + if HAS_ZTEX + bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h +-bitstreamsdir = $(bindir)/bitstreams ++bitstreamsdir = $(pkgdatadir)/bitstreams + dist_bitstreams_DATA = bitstreams/* + endif + diff --git a/libre/bfgminer/remove-dangerous-rpath.patch b/libre/bfgminer/remove-dangerous-rpath.patch new file mode 100644 index 000000000..abd815141 --- /dev/null +++ b/libre/bfgminer/remove-dangerous-rpath.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig ++++ configure.ac +@@ -514,7 +514,7 @@ + ]) + else + libblkmaker_CFLAGS='-Ilibblkmaker' +- libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS" ++ libblkmaker_LDFLAGS='-Llibblkmaker/.libs' + libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1' + AC_CONFIG_SUBDIRS([libblkmaker]) + fi diff --git a/libre/bitlbee-parabola/PKGBUILD b/libre/bitlbee-parabola/PKGBUILD deleted file mode 100644 index 3c434e7a8..000000000 --- a/libre/bitlbee-parabola/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $ - -# Contributor (Arch): FUBAR -# Contributor (Arch): simo -# Contributor (Arch): Jeff 'codemac' Mickey -# Contributor (Arch): Daniel J Griffiths -# Contributor (Arch): Gaetan Bisson -# Maintainer (Arch): Dave Reisner -# Maintainer: Márcio Silva - -_pkgname=bitlbee -pkgname=bitlbee-parabola -pkgver=3.2.2 -pkgrel=1 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' -url='http://www.bitlbee.org/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('gnutls' 'glib2') -makedepends=('asciidoc' 'libotr') -optdepends=('libotr: for OTR encryption support') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz" - 'bitlbee.tmpfiles') -sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c' - '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') -backup=('etc/bitlbee/bitlbee.conf' - 'etc/bitlbee/motd.txt') -install=bitlbee.install - -build() { - cd "$_pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --sbindir=/usr/bin \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=gnutls \ - --strip=0 \ - --otr=plugin \ - --skype=0 - - make -} - -package() { - make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd} - - install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" -} diff --git a/libre/bitlbee-parabola/bitlbee.install b/libre/bitlbee-parabola/bitlbee.install deleted file mode 100644 index c8a8f93a1..000000000 --- a/libre/bitlbee-parabola/bitlbee.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - if ! getent group bitlbee &>/dev/null; then - groupadd -r -g 65 bitlbee >/dev/null - fi - if ! getent passwd bitlbee &>/dev/null; then - useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null - fi - systemd-tmpfiles --create bitlbee.conf -} - -post_upgrade() { - post_install -} - -post_remove() { - if getent passwd bitlbee &>/dev/null; then - userdel bitlbee >/dev/null - fi - if getent group bitlbee &>/dev/null; then - groupdel bitlbee >/dev/null - fi -} diff --git a/libre/bitlbee-parabola/bitlbee.tmpfiles b/libre/bitlbee-parabola/bitlbee.tmpfiles deleted file mode 100644 index da72a0a79..000000000 --- a/libre/bitlbee-parabola/bitlbee.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/libre/bitlbee/PKGBUILD b/libre/bitlbee/PKGBUILD new file mode 100644 index 000000000..cbe8ad850 --- /dev/null +++ b/libre/bitlbee/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $ + +# Contributor (Arch): FUBAR +# Contributor (Arch): simo +# Contributor (Arch): Jeff 'codemac' Mickey +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Gaetan Bisson +# Maintainer (Arch): Dave Reisner +# Maintainer: Márcio Silva + +pkgname=bitlbee +pkgver=3.2.2 +pkgrel=1.parabola1 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' +url='http://www.bitlbee.org/' +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +depends=('gnutls' 'glib2') +makedepends=('asciidoc' 'libotr') +optdepends=('libotr: for OTR encryption support') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz" + 'bitlbee.tmpfiles') +sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c' + '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') +backup=('etc/bitlbee/bitlbee.conf' + 'etc/bitlbee/motd.txt') +install=bitlbee.install + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --sbindir=/usr/bin \ + --pidfile=/run/bitlbee/bitlbee.pid \ + --ipcsocket=/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/usr/lib/systemd/system \ + --ssl=gnutls \ + --strip=0 \ + --otr=plugin \ + --skype=0 + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd} + + install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" + install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" +} diff --git a/libre/bitlbee/bitlbee.install b/libre/bitlbee/bitlbee.install new file mode 100644 index 000000000..c8a8f93a1 --- /dev/null +++ b/libre/bitlbee/bitlbee.install @@ -0,0 +1,22 @@ +post_install() { + if ! getent group bitlbee &>/dev/null; then + groupadd -r -g 65 bitlbee >/dev/null + fi + if ! getent passwd bitlbee &>/dev/null; then + useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null + fi + systemd-tmpfiles --create bitlbee.conf +} + +post_upgrade() { + post_install +} + +post_remove() { + if getent passwd bitlbee &>/dev/null; then + userdel bitlbee >/dev/null + fi + if getent group bitlbee &>/dev/null; then + groupdel bitlbee >/dev/null + fi +} diff --git a/libre/bitlbee/bitlbee.tmpfiles b/libre/bitlbee/bitlbee.tmpfiles new file mode 100644 index 000000000..da72a0a79 --- /dev/null +++ b/libre/bitlbee/bitlbee.tmpfiles @@ -0,0 +1 @@ +d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/libre/cups-filters-parabola/PKGBUILD b/libre/cups-filters-parabola/PKGBUILD deleted file mode 100644 index 834b6dcd7..000000000 --- a/libre/cups-filters-parabola/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 220542 2014-08-22 14:56:28Z andyrtr $ -# Maintainer (Arch): Andreas Radke - -pkgname=cups-filters-parabola -_pkgname=cups-filters -pkgver=1.0.58 -pkgrel=1 -pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler' 'qpdf') -makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check -optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' - 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') -backup=(etc/fonts/conf.d/99pdftoopvp.conf - etc/cups/cups-browsed.conf) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -provides=("${_pkgname}=${pkgver}" 'foomatic-filters') -replaces=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") -conflicts=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") -md5sums=('0143ef62cd229e99fd3b03e827b1c122') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --localstatedir=/var \ - --with-rcdir=no \ - --enable-avahi \ - --with-browseremoteprotocols=DNSSD,CUPS \ - --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf - make -} - -check() { - cd $_pkgname-$pkgver - make check -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir/" install - - # add upstream systemd support file - install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service - sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service - - # use lp group from cups pkg FS#36769 - chgrp -R lp ${pkgdir}/etc/cups -} diff --git a/libre/cups-filters-parabola/cups-browsed.service b/libre/cups-filters-parabola/cups-browsed.service deleted file mode 100644 index 07b342d62..000000000 --- a/libre/cups-filters-parabola/cups-browsed.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Make remote CUPS printers available locally -After=cups.service avahi-daemon.service -Wants=cups.service avahi-daemon.service - -[Service] -ExecStart=/usr/bin/cups-browsed - -[Install] -WantedBy=multi-user.target diff --git a/libre/cups-filters-parabola/poppler_buildfix.diff b/libre/cups-filters-parabola/poppler_buildfix.diff deleted file mode 100644 index 18fc643f9..000000000 --- a/libre/cups-filters-parabola/poppler_buildfix.diff +++ /dev/null @@ -1,276 +0,0 @@ -=== modified file 'filter/pdf.cxx' ---- filter/pdf.cxx 2012-08-19 22:31:27 +0000 -+++ filter/pdf.cxx 2013-08-01 15:48:06 +0000 -@@ -17,6 +17,10 @@ - #include "pdf.h" - - #include -+#include -+#ifdef HAVE_CPP_POPPLER_VERSION_H -+#include "cpp/poppler-version.h" -+#endif - - - extern "C" pdf_t * pdf_load_template(const char *filename) -@@ -343,7 +347,11 @@ - { - } - -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+ Goffset getPos() -+#else - int getPos() -+#endif - { - return this->pos; - } - -=== modified file 'filter/pdftoijs.cxx' ---- filter/pdftoijs.cxx 2012-09-20 22:53:10 +0000 -+++ filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 -@@ -70,8 +70,13 @@ - } - - #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+void CDECL myErrorFun(void *data, ErrorCategory category, -+ Goffset pos, char *msg) -+#else - void CDECL myErrorFun(void *data, ErrorCategory category, - int pos, char *msg) -+#endif - { - if (pos >= 0) { - fprintf(stderr, "ERROR (%d): ", pos); -@@ -297,19 +302,15 @@ - if (argc == 6) { - /* stdin */ - int fd; -- Object obj; -- BaseStream *str; -- FILE *fp; -+ char name[BUFSIZ]; - char buf[BUFSIZ]; - int n; - -- fd = cupsTempFd(buf,sizeof(buf)); -+ fd = cupsTempFd(name,sizeof(name)); - if (fd < 0) { - pdfError(-1,"Can't create temporary file"); - exit(1); - } -- /* remove name */ -- unlink(buf); - - /* copy stdin to the tmp file */ - while ((n = read(0,buf,BUFSIZ)) > 0) { -@@ -319,23 +320,10 @@ - exit(1); - } - } -- if (lseek(fd,0,SEEK_SET) < 0) { -- pdfError(-1,"Can't rewind temporary file"); -- close(fd); -- exit(1); -- } -- -- if ((fp = fdopen(fd,"rb")) == 0) { -- pdfError(-1,"Can't fdopen temporary file"); -- close(fd); -- exit(1); -- } -- -- obj.initNull(); --// parsePDFTOPDFComment(fp); // TODO? -- rewind(fp); -- str = new FileStream(fp,0,gFalse,0,&obj); -- doc = new PDFDoc(str); -+ close(fd); -+ doc = new PDFDoc(new GooString(name)); -+ /* remove name */ -+ unlink(name); - } else { - GooString *fileName = new GooString(argv[6]); - /* argc == 7 filenmae is specified */ - -=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' ---- filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 08:32:55 +0000 -+++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 -@@ -112,8 +112,13 @@ - #define MAX_OPVP_OPTIONS 20 - - #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+void CDECL myErrorFun(void *data, ErrorCategory category, -+ Goffset pos, char *msg) -+#else - void CDECL myErrorFun(void *data, ErrorCategory category, - int pos, char *msg) -+#endif - { - if (pos >= 0) { - fprintf(stderr, "ERROR (%d): ", pos); -@@ -619,9 +624,6 @@ - char *s; - GooString name; - int fd; -- Object obj; -- BaseStream *str; -- FILE *fp; - char buf[4096]; - int n; - -@@ -633,8 +635,6 @@ - } - name.append("/XXXXXX"); - fd = mkstemp(name.getCString()); -- /* remove name */ -- unlink(name.getCString()); - if (fd < 0) { - opvpError(-1,"Can't create temporary file"); - exitCode = 2; -@@ -675,23 +675,10 @@ - goto err0; - } - } -- if (lseek(fd,0,SEEK_SET) < 0) { -- opvpError(-1,"Can't rewind temporary file"); -- close(fd); -- exitCode = 2; -- goto err0; -- } -- -- if ((fp = fdopen(fd,"rb")) == 0) { -- opvpError(-1,"Can't fdopen temporary file"); -- close(fd); -- exitCode = 2; -- goto err0; -- } -- -- obj.initNull(); -- str = new FileStream(fp,0,gFalse,0,&obj); -- doc = new PDFDoc(str); -+ close(fd); -+ doc = new PDFDoc(&name); -+ /* remove name */ -+ unlink(name.getCString()); - } else { - /* no jcl check */ - doc = new PDFDoc(fileName.copy()); - -=== modified file 'filter/pdftoraster.cxx' ---- filter/pdftoraster.cxx 2013-07-30 17:00:43 +0000 -+++ filter/pdftoraster.cxx 2013-08-01 15:48:06 +0000 -@@ -186,8 +186,13 @@ - } - - #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+void CDECL myErrorFun(void *data, ErrorCategory category, -+ Goffset pos, char *msg) -+#else - void CDECL myErrorFun(void *data, ErrorCategory category, - int pos, char *msg) -+#endif - { - if (pos >= 0) { - fprintf(stderr, "ERROR (%d): ", pos); -@@ -1776,19 +1781,15 @@ - if (argc == 6) { - /* stdin */ - int fd; -- Object obj; -- BaseStream *str; -- FILE *fp; -+ char name[BUFSIZ]; - char buf[BUFSIZ]; - int n; - -- fd = cupsTempFd(buf,sizeof(buf)); -+ fd = cupsTempFd(name,sizeof(name)); - if (fd < 0) { - pdfError(-1,const_cast("Can't create temporary file")); - exit(1); - } -- /* remove name */ -- unlink(buf); - - /* copy stdin to the tmp file */ - while ((n = read(0,buf,BUFSIZ)) > 0) { -@@ -1798,23 +1799,10 @@ - exit(1); - } - } -- if (lseek(fd,0,SEEK_SET) < 0) { -- pdfError(-1,const_cast("Can't rewind temporary file")); -- close(fd); -- exit(1); -- } -- -- if ((fp = fdopen(fd,"rb")) == 0) { -- pdfError(-1,const_cast("Can't fdopen temporary file")); -- close(fd); -- exit(1); -- } -- -- obj.initNull(); -- parsePDFTOPDFComment(fp); -- rewind(fp); -- str = new FileStream(fp,0,gFalse,0,&obj); -- doc = new PDFDoc(str); -+ close(fd); -+ doc = new PDFDoc(new GooString(name)); -+ /* remove name */ -+ unlink(name); - } else { - GooString *fileName = new GooString(argv[6]); - /* argc == 7 filenmae is specified */ - -=== modified file 'filter/pdftoijs.cxx' ---- filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 -+++ filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 -@@ -79,7 +79,11 @@ - #endif - { - if (pos >= 0) { -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+ fprintf(stderr, "ERROR (%lld): ", pos); -+#else - fprintf(stderr, "ERROR (%d): ", pos); -+#endif - } else { - fprintf(stderr, "ERROR: "); - } - -=== modified file 'filter/pdftoraster.cxx' ---- filter/pdftoraster.cxx 2013-08-02 11:13:38 +0000 -+++ filter/pdftoraster.cxx 2013-08-02 13:52:04 +0000 -@@ -199,7 +199,11 @@ - #endif - { - if (pos >= 0) { -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+ fprintf(stderr, "ERROR (%lld): ", pos); -+#else - fprintf(stderr, "ERROR (%d): ", pos); -+#endif - } else { - fprintf(stderr, "ERROR: "); - } - -=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' ---- filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 -+++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 -@@ -121,7 +121,11 @@ - #endif - { - if (pos >= 0) { -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 -+ fprintf(stderr, "ERROR (%lld): ", pos); -+#else - fprintf(stderr, "ERROR (%d): ", pos); -+#endif - } else { - fprintf(stderr, "ERROR: "); - } - diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD new file mode 100644 index 000000000..8e4f9a518 --- /dev/null +++ b/libre/cups-filters/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 220542 2014-08-22 14:56:28Z andyrtr $ +# Maintainer (Arch): Andreas Radke + +pkgname=cups-filters +pkgver=1.0.58 +pkgrel=1.parabola1 +pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler' 'qpdf') +makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check +optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') +backup=(etc/fonts/conf.d/99pdftoopvp.conf + etc/cups/cups-browsed.conf) +source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) +provides=('foomatic-filters') +replaces=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") +conflicts=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") +md5sums=('0143ef62cd229e99fd3b03e827b1c122') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --with-rcdir=no \ + --enable-avahi \ + --with-browseremoteprotocols=DNSSD,CUPS \ + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install + + # add upstream systemd support file + install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service + sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service + + # use lp group from cups pkg FS#36769 + chgrp -R lp ${pkgdir}/etc/cups +} diff --git a/libre/cups-filters/cups-browsed.service b/libre/cups-filters/cups-browsed.service new file mode 100644 index 000000000..07b342d62 --- /dev/null +++ b/libre/cups-filters/cups-browsed.service @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/bin/cups-browsed + +[Install] +WantedBy=multi-user.target diff --git a/libre/cups-filters/poppler_buildfix.diff b/libre/cups-filters/poppler_buildfix.diff new file mode 100644 index 000000000..18fc643f9 --- /dev/null +++ b/libre/cups-filters/poppler_buildfix.diff @@ -0,0 +1,276 @@ +=== modified file 'filter/pdf.cxx' +--- filter/pdf.cxx 2012-08-19 22:31:27 +0000 ++++ filter/pdf.cxx 2013-08-01 15:48:06 +0000 +@@ -17,6 +17,10 @@ + #include "pdf.h" + + #include ++#include ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + + extern "C" pdf_t * pdf_load_template(const char *filename) +@@ -343,7 +347,11 @@ + { + } + ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ Goffset getPos() ++#else + int getPos() ++#endif + { + return this->pos; + } + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2012-09-20 22:53:10 +0000 ++++ filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 +@@ -70,8 +70,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -297,19 +302,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,"Can't create temporary file"); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -319,23 +320,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,"Can't rewind temporary file"); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,"Can't fdopen temporary file"); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +-// parsePDFTOPDFComment(fp); // TODO? +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 08:32:55 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 +@@ -112,8 +112,13 @@ + #define MAX_OPVP_OPTIONS 20 + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -619,9 +624,6 @@ + char *s; + GooString name; + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; + char buf[4096]; + int n; + +@@ -633,8 +635,6 @@ + } + name.append("/XXXXXX"); + fd = mkstemp(name.getCString()); +- /* remove name */ +- unlink(name.getCString()); + if (fd < 0) { + opvpError(-1,"Can't create temporary file"); + exitCode = 2; +@@ -675,23 +675,10 @@ + goto err0; + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- opvpError(-1,"Can't rewind temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- opvpError(-1,"Can't fdopen temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- obj.initNull(); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(&name); ++ /* remove name */ ++ unlink(name.getCString()); + } else { + /* no jcl check */ + doc = new PDFDoc(fileName.copy()); + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-07-30 17:00:43 +0000 ++++ filter/pdftoraster.cxx 2013-08-01 15:48:06 +0000 +@@ -186,8 +186,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -1776,19 +1781,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,const_cast("Can't create temporary file")); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -1798,23 +1799,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,const_cast("Can't rewind temporary file")); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,const_cast("Can't fdopen temporary file")); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +- parsePDFTOPDFComment(fp); +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 +@@ -79,7 +79,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-08-02 11:13:38 +0000 ++++ filter/pdftoraster.cxx 2013-08-02 13:52:04 +0000 +@@ -199,7 +199,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 +@@ -121,7 +121,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + diff --git a/libre/ecasound-parabola/PKGBUILD b/libre/ecasound-parabola/PKGBUILD deleted file mode 100644 index 58f2f40f6..000000000 --- a/libre/ecasound-parabola/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 205044 2014-02-03 17:11:21Z schiv $ -# Maintainer (Arch): Ray Rashif -# Contributor (Arch): Eric Belanger -# Contributor (Arch): Tom Newsom -# Maintainer: André Silva - -_pkgname=ecasound -pkgname=ecasound-parabola -pkgver=2.9.1 -pkgrel=2 -pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.eca.cx/ecasound/" -license=('GPL' 'LGPL') -depends=('audiofile' 'liblo>=0.28' 'liboil' 'lilv') -makedepends=('python2' 'ruby') -optdepends=('python2: ecamonitor, ECI API' - 'ruby: ECI API' - 'mpg123: MP3 decoding' - 'lame: MP3 encoding' - 'vorbis-tools: Ogg Vorbis decoding/encoding' - 'faad2: AAC decoding' - 'timidity++: MIDI file input' - 'libmikmod: tracker module') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz" - 'ruby2.patch') -md5sums=('13c7be1e4eddc0bbf3792dc17777e465' - '6909dbd4f67f76d3bd31ce7c7fe16212') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files - patch -Np1 -i "$srcdir/ruby2.patch" - - PYTHONPATH=/usr/bin/python2 ./configure \ - --prefix=/usr \ - --with-python-includes=/usr/include/python2.7 \ - --with-python-modules=/usr/lib/python2.7 - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # fix for python 2.7 - sed -i 's:bin/env python:bin/env python2:' \ - "$pkgdir/usr/bin/ecamonitor" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/ecasound-parabola/ruby2.patch b/libre/ecasound-parabola/ruby2.patch deleted file mode 100644 index d55f12140..000000000 --- a/libre/ecasound-parabola/ruby2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure ---- ecasound-2.9.0.orig/configure 2013-03-26 17:14:51.759045636 +0800 -+++ ecasound-2.9.0/configure 2013-03-26 17:15:50.502060731 +0800 -@@ -6535,7 +6535,7 @@ - rubyecasound_support=no - ECA_S_RUBY_SITEDIR="" - else -- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" -+ ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" - fi - - diff --git a/libre/ecasound/PKGBUILD b/libre/ecasound/PKGBUILD new file mode 100644 index 000000000..8e156c615 --- /dev/null +++ b/libre/ecasound/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 205044 2014-02-03 17:11:21Z schiv $ +# Maintainer (Arch): Ray Rashif +# Contributor (Arch): Eric Belanger +# Contributor (Arch): Tom Newsom +# Maintainer: André Silva + +pkgname=ecasound +pkgver=2.9.1 +pkgrel=2.parabola1 +pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.eca.cx/ecasound/" +license=('GPL' 'LGPL') +depends=('audiofile' 'liblo>=0.28' 'liboil' 'lilv') +makedepends=('python2' 'ruby') +optdepends=('python2: ecamonitor, ECI API' + 'ruby: ECI API' + 'mpg123: MP3 decoding' + 'lame: MP3 encoding' + 'vorbis-tools: Ogg Vorbis decoding/encoding' + 'faad2: AAC decoding' + 'timidity++: MIDI file input' + 'libmikmod: tracker module') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +source=("http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz" + 'ruby2.patch') +md5sums=('13c7be1e4eddc0bbf3792dc17777e465' + '6909dbd4f67f76d3bd31ce7c7fe16212') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files + patch -Np1 -i "$srcdir/ruby2.patch" + + PYTHONPATH=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --with-python-includes=/usr/include/python2.7 \ + --with-python-modules=/usr/lib/python2.7 + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + # fix for python 2.7 + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/ecamonitor" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/ecasound/ruby2.patch b/libre/ecasound/ruby2.patch new file mode 100644 index 000000000..d55f12140 --- /dev/null +++ b/libre/ecasound/ruby2.patch @@ -0,0 +1,12 @@ +diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure +--- ecasound-2.9.0.orig/configure 2013-03-26 17:14:51.759045636 +0800 ++++ ecasound-2.9.0/configure 2013-03-26 17:15:50.502060731 +0800 +@@ -6535,7 +6535,7 @@ + rubyecasound_support=no + ECA_S_RUBY_SITEDIR="" + else +- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" ++ ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" + fi + + diff --git a/libre/engrampa-parabola/PKGBUILD b/libre/engrampa-parabola/PKGBUILD deleted file mode 100644 index c94f519aa..000000000 --- a/libre/engrampa-parabola/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 107641 2014-03-18 11:10:40Z flexiondotorg $ -# Maintainer (Arch): Martin Wimpress -# Maintainer: André Silva - -_pkgname=engrampa -pkgname=engrampa-parabola -pkgver=1.8.0 -pkgrel=1 -pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar') -makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools' 'json-glib') # json-glib is necessary to enable unar support on the package -optdepends=('unar: for RAR uncompression' - 'zip: for ZIP archives' 'unzip: for ZIP archives' - 'p7zip: 7zip compression utility' 'arj: for ARJ archives' - 'yelp: for reading MATE help documents') -replaces=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre") -provides=('mate-file-archiver' "${_pkgname}=$pkgver") -conflicts=('mate-file-archiver' "${_pkgname}" "${_pkgname}-libre") -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz" - fr-rpm-bsdtar.patch) -sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65' - '219b05a979bf6f249aaae27964f02345fd81168d') -install=${_pkgname}.install - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # This patch 'depends' on libarchive - patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --with-gtk=2.0 \ - --disable-static \ - --disable-packagekit - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/engrampa-parabola/engrampa.install b/libre/engrampa-parabola/engrampa.install deleted file mode 100644 index bf6781f93..000000000 --- a/libre/engrampa-parabola/engrampa.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/engrampa-parabola/fr-rpm-bsdtar.patch b/libre/engrampa-parabola/fr-rpm-bsdtar.patch deleted file mode 100644 index 93a783176..000000000 --- a/libre/engrampa-parabola/fr-rpm-bsdtar.patch +++ /dev/null @@ -1,60 +0,0 @@ -This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. -It is useful on systems that do not have cpio or RPM/YUM -This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. - -------------------+ - rpm2cpio.c | 2 +- - fr-command-rpm.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -Index: src/commands/rpm2cpio.c -================================ ---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 -@@ -128,7 +128,7 @@ - archive_command = "bzip2 -dc"; - fclose (stream); - -- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); -+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); - - return system (command); - } -Index: src/fr-command-rpm.c -================================ ---- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 -@@ -175,7 +175,7 @@ - - fr_process_begin_command (comm->process, "sh"); - fr_process_add_arg (comm->process, "-c"); -- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); -+ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); - fr_process_end_command (comm->process); - fr_process_start (comm->process); - } -@@ -200,7 +200,7 @@ - - cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); - g_string_append (cmd, comm->e_filename); -- g_string_append (cmd, " -idu "); -+ g_string_append (cmd, " -xf - "); - for (scan = file_list; scan; scan = scan->next) { - char *filename = g_shell_quote (scan->data); - g_string_append (cmd, filename); -@@ -233,7 +233,7 @@ - FrCommandCap capabilities; - - capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; -- if (is_program_available ("cpio", check_command)) -+ if (is_program_available ("bsdtar", check_command)) - capabilities |= FR_COMMAND_CAN_READ; - - return capabilities; -@@ -244,7 +244,7 @@ - fr_command_rpm_get_packages (FrCommand *comm, - const char *mime_type) - { -- return PACKAGES ("cpio,rpm"); -+ return PACKAGES ("bsdtar,rpm"); - } diff --git a/libre/engrampa/PKGBUILD b/libre/engrampa/PKGBUILD new file mode 100644 index 000000000..6952dc040 --- /dev/null +++ b/libre/engrampa/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 107641 2014-03-18 11:10:40Z flexiondotorg $ +# Maintainer (Arch): Martin Wimpress +# Maintainer: André Silva + +pkgname=engrampa +pkgver=1.8.0 +pkgrel=1.parabola1 +pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar') +makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools' 'json-glib') # json-glib is necessary to enable unar support on the package +optdepends=('unar: for RAR uncompression' + 'zip: for ZIP archives' 'unzip: for ZIP archives' + 'p7zip: 7zip compression utility' 'arj: for ARJ archives' + 'yelp: for reading MATE help documents') +replaces=('mate-file-archiver' "${pkgname}-libre" "${pkgname}-parabola") +provides=('mate-file-archiver') +conflicts=('mate-file-archiver' "${pkgname}-libre" "${pkgname}-parabola") +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" + fr-rpm-bsdtar.patch) +sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65' + '219b05a979bf6f249aaae27964f02345fd81168d') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # This patch 'depends' on libarchive + patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --with-gtk=2.0 \ + --disable-static \ + --disable-packagekit + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/engrampa/engrampa.install b/libre/engrampa/engrampa.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/engrampa/engrampa.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/engrampa/fr-rpm-bsdtar.patch b/libre/engrampa/fr-rpm-bsdtar.patch new file mode 100644 index 000000000..93a783176 --- /dev/null +++ b/libre/engrampa/fr-rpm-bsdtar.patch @@ -0,0 +1,60 @@ +This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. +It is useful on systems that do not have cpio or RPM/YUM +This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. + +------------------+ + rpm2cpio.c | 2 +- + fr-command-rpm.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: src/commands/rpm2cpio.c +================================ +--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 +@@ -128,7 +128,7 @@ + archive_command = "bzip2 -dc"; + fclose (stream); + +- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); ++ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); + + return system (command); + } +Index: src/fr-command-rpm.c +================================ +--- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 +@@ -175,7 +175,7 @@ + + fr_process_begin_command (comm->process, "sh"); + fr_process_add_arg (comm->process, "-c"); +- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); ++ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); + fr_process_end_command (comm->process); + fr_process_start (comm->process); + } +@@ -200,7 +200,7 @@ + + cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); + g_string_append (cmd, comm->e_filename); +- g_string_append (cmd, " -idu "); ++ g_string_append (cmd, " -xf - "); + for (scan = file_list; scan; scan = scan->next) { + char *filename = g_shell_quote (scan->data); + g_string_append (cmd, filename); +@@ -233,7 +233,7 @@ + FrCommandCap capabilities; + + capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; +- if (is_program_available ("cpio", check_command)) ++ if (is_program_available ("bsdtar", check_command)) + capabilities |= FR_COMMAND_CAN_READ; + + return capabilities; +@@ -244,7 +244,7 @@ + fr_command_rpm_get_packages (FrCommand *comm, + const char *mime_type) + { +- return PACKAGES ("cpio,rpm"); ++ return PACKAGES ("bsdtar,rpm"); + } diff --git a/libre/file-roller-parabola/PKGBUILD b/libre/file-roller-parabola/PKGBUILD deleted file mode 100644 index 4cdc7cb17..000000000 --- a/libre/file-roller-parabola/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 213482 2014-05-23 23:43:56Z heftig $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Contributor (Arch): Jan de Groot - -_pkgname=file-roller -pkgname=file-roller-parabola -pkgver=3.12.2 -pkgrel=1 -pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar') -makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') -optdepends=('lrzip: lrzip archive support') -groups=('gnome-extra') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -options=('!emptydirs') -install=file-roller.install -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf') - -build() { - cd $_pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/file-roller \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/libre/file-roller-parabola/bug708854.patch b/libre/file-roller-parabola/bug708854.patch deleted file mode 100644 index 6a5591a59..000000000 --- a/libre/file-roller-parabola/bug708854.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Thu, 26 Sep 2013 16:06:21 +0000 -Subject: 7z: allow extracting/opening/adding files prefixed with '@' - -7z uses '@' to specify a listfile; i.e. a file with a list of files to add or -extract. Therefore, if working with single files (e.g. open, add or extract a -single file from the archive), the filenames need to be escaped with '!' and -specified with '-i'. It is ok to mix files specified with '-i' and the ones -given after the archive filename. - -E.g. instead of: - 7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF - -it should be: - 7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP - -https://bugzilla.gnome.org/show_bug.cgi?id=708854 ---- -diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c -index f2e70a6..a9d15fd 100644 ---- a/src/fr-command-7z.c -+++ b/src/fr-command-7z.c -@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand *command, - if (from_file != NULL) - fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); - -+ if (from_file == NULL) -+ for (scan = file_list; scan; scan = scan->next) -+ /* Files prefixed with '@' need to be handled specially */ -+ if (g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); -+ - fr_process_add_arg (command->process, "--"); - fr_process_add_arg (command->process, command->filename); -+ - if (from_file == NULL) - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (command->process, scan->data); -+ /* Skip files prefixed with '@', already added */ -+ if (!g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg (command->process, scan->data); - - fr_process_end_command (command->process); - } -@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand *command, - if (from_file != NULL) - fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); - -+ if (from_file == NULL) -+ for (scan = file_list; scan; scan = scan->next) -+ /* Files prefixed with '@' need to be handled specially */ -+ if (g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); -+ - fr_process_add_arg (command->process, "--"); - fr_process_add_arg (command->process, command->filename); -+ - if (from_file == NULL) - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (command->process, scan->data); -+ /* Skip files prefixed with '@', already added */ -+ if (!g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg (command->process, scan->data); - - fr_process_end_command (command->process); - } -@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand *command, - if (from_file != NULL) - fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); - -+ if (from_file == NULL) -+ for (scan = file_list; scan; scan = scan->next) -+ /* Files prefixed with '@' need to be handled specially */ -+ if (g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); -+ -+ - fr_process_add_arg (command->process, "--"); - fr_process_add_arg (command->process, command->filename); -+ - if (from_file == NULL) - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (command->process, scan->data); -+ /* Skip files prefixed with '@', already added */ -+ if (!g_str_has_prefix (scan->data, "@")) -+ fr_process_add_arg (command->process, scan->data); - - fr_process_end_command (command->process); - } --- -cgit v0.9.2 diff --git a/libre/file-roller-parabola/bug709035.patch b/libre/file-roller-parabola/bug709035.patch deleted file mode 100644 index f82e33f30..000000000 --- a/libre/file-roller-parabola/bug709035.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Sun, 29 Sep 2013 16:30:29 +0000 -Subject: libarchive: fixed failure when extracting some tar archives - -do not try to restore the creation time; -do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute - -[bug #709035] ---- -diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c -index 42673df..44aaad2 100644 ---- a/src/fr-archive-libarchive.c -+++ b/src/fr-archive-libarchive.c -@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry, - - /* times */ - -- if (archive_entry_ctime_is_set (entry)) { -- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry)); -- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry)); -- } -- -- if (archive_entry_mtime_is_set (entry)) { -+ if (archive_entry_mtime_is_set (entry)) - g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry)); -- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry)); -- } - - /* username */ - -@@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders, - - info = g_file_info_new (); - g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); -- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); -+ if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET) -+ g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); - result = _g_file_set_attributes_from_info (file, info, cancellable, error); - - g_object_unref (info); --- -cgit v0.9.2 diff --git a/libre/file-roller-parabola/file-roller.install b/libre/file-roller-parabola/file-roller.install deleted file mode 100644 index 8b17fa3d4..000000000 --- a/libre/file-roller-parabola/file-roller.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/file-roller-parabola/rePKGBUILD b/libre/file-roller-parabola/rePKGBUILD deleted file mode 100644 index a83d218f1..000000000 --- a/libre/file-roller-parabola/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Nicolás Reynolds -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -_repo=extra # Put the repo here -_mirror=http://mirrors.kernel.org/archlinux # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm .{INSTALL,PKGINFO} - # put actions for package modifications below this line - -} - -package() { - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD new file mode 100644 index 000000000..937f02cba --- /dev/null +++ b/libre/file-roller/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 213482 2014-05-23 23:43:56Z heftig $ +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot + +pkgname=file-roller +pkgver=3.12.2 +pkgrel=1.parabola1 +pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar') +makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') +optdepends=('lrzip: lrzip archive support') +groups=('gnome-extra') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +options=('!emptydirs') +install=file-roller.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/file-roller \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/file-roller/bug708854.patch b/libre/file-roller/bug708854.patch new file mode 100644 index 000000000..6a5591a59 --- /dev/null +++ b/libre/file-roller/bug708854.patch @@ -0,0 +1,92 @@ +From d3ce6fe6964857c89212ab1a5a7aaa052d93c584 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado +Date: Thu, 26 Sep 2013 16:06:21 +0000 +Subject: 7z: allow extracting/opening/adding files prefixed with '@' + +7z uses '@' to specify a listfile; i.e. a file with a list of files to add or +extract. Therefore, if working with single files (e.g. open, add or extract a +single file from the archive), the filenames need to be escaped with '!' and +specified with '-i'. It is ok to mix files specified with '-i' and the ones +given after the archive filename. + +E.g. instead of: + 7z x -bd -y -o/tmp/.fr-2z9FXz -- HS04603.ZIP @HS04603.PDF + +it should be: + 7z x -bd -y -o/tmp/.fr-2z9FXz -i!@HS04603.PDF -- HS04603.ZIP + +https://bugzilla.gnome.org/show_bug.cgi?id=708854 +--- +diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c +index f2e70a6..a9d15fd 100644 +--- a/src/fr-command-7z.c ++++ b/src/fr-command-7z.c +@@ -375,11 +375,20 @@ fr_command_7z_add (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +@@ -409,11 +418,20 @@ fr_command_7z_delete (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +@@ -463,11 +481,21 @@ fr_command_7z_extract (FrCommand *command, + if (from_file != NULL) + fr_process_add_arg_concat (command->process, "-i@", from_file, NULL); + ++ if (from_file == NULL) ++ for (scan = file_list; scan; scan = scan->next) ++ /* Files prefixed with '@' need to be handled specially */ ++ if (g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg_concat (command->process, "-i!", scan->data, NULL); ++ ++ + fr_process_add_arg (command->process, "--"); + fr_process_add_arg (command->process, command->filename); ++ + if (from_file == NULL) + for (scan = file_list; scan; scan = scan->next) +- fr_process_add_arg (command->process, scan->data); ++ /* Skip files prefixed with '@', already added */ ++ if (!g_str_has_prefix (scan->data, "@")) ++ fr_process_add_arg (command->process, scan->data); + + fr_process_end_command (command->process); + } +-- +cgit v0.9.2 diff --git a/libre/file-roller/bug709035.patch b/libre/file-roller/bug709035.patch new file mode 100644 index 000000000..f82e33f30 --- /dev/null +++ b/libre/file-roller/bug709035.patch @@ -0,0 +1,43 @@ +From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Sun, 29 Sep 2013 16:30:29 +0000 +Subject: libarchive: fixed failure when extracting some tar archives + +do not try to restore the creation time; +do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute + +[bug #709035] +--- +diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c +index 42673df..44aaad2 100644 +--- a/src/fr-archive-libarchive.c ++++ b/src/fr-archive-libarchive.c +@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry, + + /* times */ + +- if (archive_entry_ctime_is_set (entry)) { +- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry)); +- } +- +- if (archive_entry_mtime_is_set (entry)) { ++ if (archive_entry_mtime_is_set (entry)) + g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry)); +- } + + /* username */ + +@@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders, + + info = g_file_info_new (); + g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED)); +- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); ++ if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET) ++ g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC)); + result = _g_file_set_attributes_from_info (file, info, cancellable, error); + + g_object_unref (info); +-- +cgit v0.9.2 diff --git a/libre/file-roller/file-roller.install b/libre/file-roller/file-roller.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/libre/file-roller/file-roller.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/file-roller/rePKGBUILD b/libre/file-roller/rePKGBUILD new file mode 100644 index 000000000..a83d218f1 --- /dev/null +++ b/libre/file-roller/rePKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Nicolás Reynolds +source PKGBUILD +#CARCH=x86_64 +unset build package md5sums source +_repo=extra # Put the repo here +_mirror=http://mirrors.kernel.org/archlinux # Put mirror here +source=(PKGBUILD + "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" + # files for pkg modifications below this line + ) +options=(!strip) + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} + # put actions for package modifications below this line + +} + +package() { + find ${srcdir} -maxdepth 1 -type l -delete + cp -a ${srcdir}/* ${pkgdir} +} + + +# vim:set ts=2 sw=2 et: diff --git a/libre/filesystem-parabola/PKGBUILD b/libre/filesystem-parabola/PKGBUILD deleted file mode 100644 index 0bc0fac54..000000000 --- a/libre/filesystem-parabola/PKGBUILD +++ /dev/null @@ -1,167 +0,0 @@ -# $Id: PKGBUILD 216487 2014-07-04 13:14:12Z dreisner $ -# Maintainer (Arch): Tom Gundersen -# Maintainer: Nicolás Reynolds -# Maintainer: André Silva - -_pkgname=filesystem -pkgname=filesystem-parabola -pkgver=2014.07 -pkgrel=1.1 -pkgdesc='Base filesystem (Parabola rebranded)' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url='https://parabolagnulinux.org' -groups=('base') -install='filesystem.install' -makedepends=('asciidoc') -depends=('iana-etc') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' - 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' - 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') -source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' - 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' - 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' - 'locale.sh') -md5sums=('d46cb1adf8175888cc827a3dad8857d2' - '6be47d893fd49b2e4a8c0e811b350861' - '9e4533df61f0c82d6b2e2371f7376282' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - 'a998d1e6c7cc5791a7f4a2b49b2d10ce' - '1ec1b16e2a71fad63ab8f147069a5d97' - '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - '09bce9236c3729d31aaa528bcf5d198e' - '0b6f835598c7640184e476057b3c7722' - 'a8a962370cd0128465d514e6a1f74130' - 'd5732ffdb3488e1383d4ea199343e767' - '4fab2b798deff348e04f05152111aae0') - -lint() { - # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. - local r=0 - - local passwd shadow group gshadow - - for f in passwd shadow group gshadow; do - mapfile -t "$f" < <(cut -d: -f1 "$f" | sort) - done - - # we can cheat and do simple string comparison only because we can make some - # assumptions about the data in these files - if [[ ${passwd[*]} != "${shadow[*]}" ]]; then - error 'passwd is not in sync with shadow!' - r=1 - fi - - if [[ ${group[*]} != "${gshadow[*]}" ]]; then - error 'group is not in sync with gshadow!' - r=1 - fi - - return $r -} - -build() { - cd ${srcdir} - - lint - - a2x -d manpage -f manpage parabola.7.txt -} - -package() { - cd ${pkgdir} - - # - # setup root filesystem - # - for d in boot dev etc home mnt usr var opt srv/http run; do - install -d -m755 ${d} - done - install -d -m555 proc - install -d -m555 sys - install -d -m0750 root - install -d -m1777 tmp - # vsftpd won't run with write perms on /srv/ftp - install -d -m555 -g ftp srv/ftp - - # setup /etc - install -d etc/{ld.so.conf.d,skel,profile.d} - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do - install -m644 ${srcdir}/${f} etc/ - done - ln -s /proc/self/mounts etc/mtab - for f in gshadow shadow crypttab; do - install -m600 ${srcdir}/${f} etc/ - done - touch etc/parabola-release - ln -sv parabola-release etc/arch-release - install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf - install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh - install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release - - # setup /var - for d in cache/man local opt log/old lib/misc empty; do - install -d -m755 var/${d} - done - install -d -m1777 var/{tmp,spool/mail} - # allow setgid games to write scores - install -d -m775 -g games var/games - ln -s spool/mail var/mail - ln -s ../run var/run - ln -s ../run/lock var/lock - - # - # setup /usr hierarchy - # - for d in bin include lib share/misc src; do - install -d -m755 usr/${d} - done - for d in $(seq 8); do - install -d -m755 usr/share/man/man${d} - done - - # - # add lib symlinks - # - ln -s usr/lib ${pkgdir}/lib - [[ ${CARCH} = "x86_64" ]] && ( - ln -s usr/lib ${pkgdir}/lib64 - ln -s lib ${pkgdir}/usr/lib64 - ) - [[ ${CARCH} = "mips64el" ]] && ( - # For the N32 ABI. - ln -s usr/lib ${pkgdir}/lib32 - ln -s lib ${pkgdir}/usr/lib32 - ) - - # - # add bin symlinks - # - ln -s usr/bin ${pkgdir}/bin - ln -s usr/bin ${pkgdir}/sbin - ln -s bin ${pkgdir}/usr/sbin - - # - # install parabola(7) manpage - # - install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 - - # - # setup /usr/local hierarchy - # - for d in bin etc games include lib man sbin share src; do - install -d -m755 usr/local/${d} - done - ln -s ../man usr/local/share/man -} diff --git a/libre/filesystem-parabola/crypttab b/libre/filesystem-parabola/crypttab deleted file mode 100644 index 195945a74..000000000 --- a/libre/filesystem-parabola/crypttab +++ /dev/null @@ -1,17 +0,0 @@ -# crypttab: mappings for encrypted partitions -# -# Each mapped device will be created in /dev/mapper, so your /etc/fstab -# should use the /dev/mapper/ paths for encrypted devices. -# -# The Arch specific syntax has been deprecated, see crypttab(5) for the -# new supported syntax. -# -# NOTE: Do not list your root (/) partition here, it must be set up -# beforehand by the initramfs (/etc/mkinitcpio.conf). - -# -# home /dev/hda4 /etc/mypassword1 -# data1 /dev/hda3 /etc/mypassword2 -# data2 /dev/hda5 /etc/cryptfs.key -# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/hdb7 none diff --git a/libre/filesystem-parabola/filesystem.install b/libre/filesystem-parabola/filesystem.install deleted file mode 100644 index d70906f47..000000000 --- a/libre/filesystem-parabola/filesystem.install +++ /dev/null @@ -1,79 +0,0 @@ -# args: [options] -_addgroup() { - if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then - need_group_update=1 - fi -} - -# args: [options] -_adduser() { - if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then - need_passwd_update=1 - fi -} - -post_install() { - _backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' - 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' - 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') - for _bk in ${_backup[@]}; do - if [ -f ${_bk}.pacsave ]; then - cp -av ${_bk}{.pacsave,} - fi - done -} - -post_upgrade() { - _addgroup optical -g 93 - _addgroup audio -g 92 - _addgroup video -g 91 - _addgroup floppy -g 94 - _addgroup storage -g 95 - _addgroup log -g 19 - _addgroup utmp -g 20 - _addgroup power -g 98 - _addgroup network -g 90 - _addgroup games -g 50 - _addgroup uucp -g 14 - _addgroup http -g 33 - _adduser http -u 33 -d /srv/http -g http -s /usr/bin/nologin - _addgroup scanner -g 96 - _addgroup rfkill -g 24 - _addgroup lock -g 54 - _addgroup uuidd -g 68 - _adduser uuidd -u 68 -d / -g uuidd -s /usr/bin/nologin - _addgroup dbus -g 81 - _adduser dbus -u 81 -d / -g dbus -s /usr/bin/nologin - _addgroup input -g 97 - _addgroup systemd-journal -g 190 - _addgroup systemd-journal-gateway -g 191 - _adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin - _addgroup systemd-timesync -g 192 - _adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin - _addgroup systemd-network -g 193 - _adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin - _addgroup systemd-bus-proxy -g 194 - _adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin - _addgroup systemd-resolve -g 195 - _adduser systemd-resolve -u 195 -g 195 -d / -s /usr/bin/nologin - - # update shadow files if needed - if (( need_group_update )); then - grpconv >/dev/null - fi - - if (( need_passwd_update )); then - pwconv >/dev/null - fi - - if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then - echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf - fi - - # set "Last password change" > 0; otherwise su $user wont work - for user in bin daemon mail ftp http nobody; do - if LANG=C chage -l ${user} | grep -q 'password must be changed'; then - chage -d 14871 ${user} - fi - done -} diff --git a/libre/filesystem-parabola/fstab b/libre/filesystem-parabola/fstab deleted file mode 100644 index b6716c14a..000000000 --- a/libre/filesystem-parabola/fstab +++ /dev/null @@ -1,4 +0,0 @@ -# -# /etc/fstab: static file system information -# -# diff --git a/libre/filesystem-parabola/group b/libre/filesystem-parabola/group deleted file mode 100644 index ebfb87169..000000000 --- a/libre/filesystem-parabola/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin -adm:x:4:root,daemon -tty:x:5: -disk:x:6:root -lp:x:7:daemon -mem:x:8: -kmem:x:9: -wheel:x:10:root -ftp:x:11: -mail:x:12: -uucp:x:14: -log:x:19:root -utmp:x:20: -locate:x:21: -rfkill:x:24: -smmsp:x:25: -http:x:33: -games:x:50: -lock:x:54: -uuidd:x:68: -dbus:x:81: -network:x:90: -video:x:91: -audio:x:92: -optical:x:93: -floppy:x:94: -storage:x:95: -scanner:x:96: -input:x:97: -power:x:98: -nobody:x:99: -users:x:100: -systemd-journal:x:190: -systemd-journal-gateway:x:191: -systemd-timesync:x:192: -systemd-network:x:193: -systemd-bus-proxy:x:194: -systemd-resolve:x:195: diff --git a/libre/filesystem-parabola/gshadow b/libre/filesystem-parabola/gshadow deleted file mode 100644 index 1fcb075bc..000000000 --- a/libre/filesystem-parabola/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin -adm:::root,daemon -tty::: -disk:::root -lp:::daemon -mem::: -kmem::: -wheel:::root -ftp::: -mail::: -uucp::: -log:::root -utmp:x:: -locate::: -rfkill:x:: -smmsp::: -http::: -games::: -lock::: -uuidd:x:: -dbus:x:: -network:x:: -video:x:: -audio::: -optical::: -floppy:x:: -storage:x:: -scanner:x:: -input:x:: -power:x:: -nobody::: -users::: -systemd-journal::: -systemd-journal-gateway::: -systemd-timesync::: -systemd-network::: -systemd-bus-proxy::: -systemd-resolve::: diff --git a/libre/filesystem-parabola/host.conf b/libre/filesystem-parabola/host.conf deleted file mode 100644 index cf52fe561..000000000 --- a/libre/filesystem-parabola/host.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/host.conf -# - -order hosts,bind -multi on - -# End of file diff --git a/libre/filesystem-parabola/hosts b/libre/filesystem-parabola/hosts deleted file mode 100644 index 1747f9196..000000000 --- a/libre/filesystem-parabola/hosts +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -# -127.0.0.1 localhost.localdomain localhost -::1 localhost.localdomain localhost - -# End of file diff --git a/libre/filesystem-parabola/issue b/libre/filesystem-parabola/issue deleted file mode 100644 index b001c55dd..000000000 --- a/libre/filesystem-parabola/issue +++ /dev/null @@ -1,2 +0,0 @@ -Parabola GNU/Linux-libre \r (\n) (\l) - diff --git a/libre/filesystem-parabola/ld.so.conf b/libre/filesystem-parabola/ld.so.conf deleted file mode 100644 index dfac45683..000000000 --- a/libre/filesystem-parabola/ld.so.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ld.so.conf -# - -include /etc/ld.so.conf.d/*.conf - -# End of file diff --git a/libre/filesystem-parabola/locale.sh b/libre/filesystem-parabola/locale.sh deleted file mode 100644 index 3cfc89c1b..000000000 --- a/libre/filesystem-parabola/locale.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf -fi - -LANG=${LANG:-C} -export LANG -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first b/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first deleted file mode 100644 index 947379411..000000000 --- a/libre/filesystem-parabola/modprobe.d.usb-load-ehci-first +++ /dev/null @@ -1,2 +0,0 @@ -softdep ohci_hcd pre: ehci_hcd -softdep uhci_hcd pre: ehci_hcd diff --git a/libre/filesystem-parabola/motd b/libre/filesystem-parabola/motd deleted file mode 100644 index e69de29bb..000000000 diff --git a/libre/filesystem-parabola/nsswitch.conf b/libre/filesystem-parabola/nsswitch.conf deleted file mode 100644 index 4a4f5770d..000000000 --- a/libre/filesystem-parabola/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/nsswitch.conf - -passwd: files -group: files -shadow: files - -publickey: files - -hosts: files dns myhostname -networks: files - -protocols: files -services: files -ethers: files -rpc: files - -netgroup: files - -# End /etc/nsswitch.conf diff --git a/libre/filesystem-parabola/os-release b/libre/filesystem-parabola/os-release deleted file mode 100644 index fe5f20b4f..000000000 --- a/libre/filesystem-parabola/os-release +++ /dev/null @@ -1,8 +0,0 @@ -NAME="Parabola" -ID=parabola -ID_LIKE=arch -PRETTY_NAME="Parabola GNU/Linux-libre" -ANSI_COLOR="1;35" -HOME_URL="https://parabolagnulinux.org/" -BUG_REPORT_URL="https://labs.parabola.nu/" - diff --git a/libre/filesystem-parabola/parabola.7.txt b/libre/filesystem-parabola/parabola.7.txt deleted file mode 100644 index 60e1121e0..000000000 --- a/libre/filesystem-parabola/parabola.7.txt +++ /dev/null @@ -1,91 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// -parabola(7) -============ - -NAME ----- -parabola - basic configuration - -SYNOPSIS --------- -Overview of the basic configuration of Parabola GNU/Linux-libre. - -DESCRIPTION ------------ -Parabola exposes the user to the system without hiding any details. -This man page gives a brief overview of the configuration files that should be set up on a fresh install. - -SYSTEM SERVICES[[S]] --------------------- -System services to be started at boot can be enabled using 'systemctl enable '. -To view available services, use 'systemctl list-unit-files'. - -HOSTNAME[[H]] -------------- -The hostname of the machine can be set using 'hostnamectl set-hostname '. -It will then be written to /etc/hostname. - -LOCALIZATION[[L]] ------------------ -Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'. -The system-wide locale to be used can be configured in /etc/locale.conf. -These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf. -The user-specific file will take precedence if it exists. - -VIRTUAL CONSOLE[[V]] --------------------- -The virtual console is configured in /etc/vconsole.conf. -It allows you to set a font and a keyboard layout, among other things. -Note that these settings only apply to the console and do not apply if you use X. - -TIME[[T]] ---------- -The local time zone is configured by calling 'timedatectl set-timezone '. -A relative *symlink* is then created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. For example, - - /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris - -The real-time clock, which keeps track of time when the computer is off, can be configured to either -be in UTC or in local time by calling 'timedatectl set-local-rtc '. -The default is UTC. - -FILE SYSTEMS[[F]] ------------------ -File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. - -INITRAMFS[[R]] --------------- -The initramfs is generated by 'mkinitcpio -p '. -The default preset is "linux-libre". -The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes. - -PACKAGE MANAGER[[P]] --------------------- -The package manager, pacman, is configured in /etc/pacman.conf. - -BOOT LOADER[[B]] ----------------- -GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'. -Syslinux is configured in /boot/syslinux/syslinux.cfg. - -MODULES[[M]] ------------- -Most modules should be loaded on-demand. -Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, -and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/. - -SEE ALSO --------- - -*systemctl*(1), *hostnamectl*(1), *hostname*(5), *locale.conf*(5), -*vconsole.conf*(5), *timedatectl*(1), *timezone*(3), *hwclock*(8), -*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5), -*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5), -*systemd*(1) - -AUTHORS -------- -Written by Tom Gundersen. -Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/libre/filesystem-parabola/passwd b/libre/filesystem-parabola/passwd deleted file mode 100644 index b3e79eb9d..000000000 --- a/libre/filesystem-parabola/passwd +++ /dev/null @@ -1,14 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/usr/bin/nologin -daemon:x:2:2:daemon:/:/usr/bin/nologin -mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin -ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin -http:x:33:33:http:/srv/http:/usr/bin/nologin -uuidd:x:68:68:uuidd:/:/usr/bin/nologin -dbus:x:81:81:dbus:/:/usr/bin/nologin -nobody:x:99:99:nobody:/:/usr/bin/nologin -systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin -systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin -systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin -systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin -systemd-resolve:x:195:195:systemd-resolve:/:/usr/bin/nologin diff --git a/libre/filesystem-parabola/profile b/libre/filesystem-parabola/profile deleted file mode 100644 index 59d0abc83..000000000 --- a/libre/filesystem-parabola/profile +++ /dev/null @@ -1,27 +0,0 @@ -# /etc/profile - -#Set our umask -umask 022 - -# Set our default path -PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" -export PATH - -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -r "$profile" && . "$profile" - done - unset profile -fi - -# Source global bash config -if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then - . /etc/bash.bashrc -fi - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH diff --git a/libre/filesystem-parabola/resolv.conf b/libre/filesystem-parabola/resolv.conf deleted file mode 100644 index cecafba03..000000000 --- a/libre/filesystem-parabola/resolv.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/resolv.conf -# - -#search -#nameserver - -# End of file diff --git a/libre/filesystem-parabola/securetty b/libre/filesystem-parabola/securetty deleted file mode 100644 index 5a2235ce7..000000000 --- a/libre/filesystem-parabola/securetty +++ /dev/null @@ -1,15 +0,0 @@ -# -# /etc/securetty -# - -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyS0 -hvc0 - -# End of file diff --git a/libre/filesystem-parabola/shadow b/libre/filesystem-parabola/shadow deleted file mode 100644 index 4c6e3d18f..000000000 --- a/libre/filesystem-parabola/shadow +++ /dev/null @@ -1,14 +0,0 @@ -root::14871:::::: -bin:x:14871:::::: -daemon:x:14871:::::: -mail:x:14871:::::: -ftp:x:14871:::::: -http:x:14871:::::: -uuidd:x:14871:::::: -dbus:x:14871:::::: -nobody:x:14871:::::: -systemd-journal-gateway:x:14871:::::: -systemd-timesync:x:14871:::::: -systemd-network:x:14871:::::: -systemd-bus-proxy:x:14871:::::: -systemd-resolve:x:14871:::::: diff --git a/libre/filesystem-parabola/shells b/libre/filesystem-parabola/shells deleted file mode 100644 index 18c1aeffa..000000000 --- a/libre/filesystem-parabola/shells +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/shells -# - -/bin/sh -/bin/bash - -# End of file diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD new file mode 100644 index 000000000..446d4e49d --- /dev/null +++ b/libre/filesystem/PKGBUILD @@ -0,0 +1,165 @@ +# $Id: PKGBUILD 216487 2014-07-04 13:14:12Z dreisner $ +# Maintainer (Arch): Tom Gundersen +# Maintainer: Nicolás Reynolds +# Maintainer: André Silva + +pkgname=filesystem +pkgver=2014.07 +pkgrel=1.parabola1 +pkgdesc='Base filesystem (Parabola rebranded)' +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url='https://parabolagnulinux.org' +groups=('base') +install='filesystem.install' +makedepends=('asciidoc') +depends=('iana-etc') +replaces=(${pkgname}-parabola) +conflicts=(${pkgname}-parabola) +backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' + 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') +source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' + 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' + 'locale.sh') +md5sums=('d46cb1adf8175888cc827a3dad8857d2' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + 'a998d1e6c7cc5791a7f4a2b49b2d10ce' + '1ec1b16e2a71fad63ab8f147069a5d97' + '693c97f2c9a519bb97a17008e92c2b74' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + '09bce9236c3729d31aaa528bcf5d198e' + '0b6f835598c7640184e476057b3c7722' + 'a8a962370cd0128465d514e6a1f74130' + 'd5732ffdb3488e1383d4ea199343e767' + '4fab2b798deff348e04f05152111aae0') + +lint() { + # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. + local r=0 + + local passwd shadow group gshadow + + for f in passwd shadow group gshadow; do + mapfile -t "$f" < <(cut -d: -f1 "$f" | sort) + done + + # we can cheat and do simple string comparison only because we can make some + # assumptions about the data in these files + if [[ ${passwd[*]} != "${shadow[*]}" ]]; then + error 'passwd is not in sync with shadow!' + r=1 + fi + + if [[ ${group[*]} != "${gshadow[*]}" ]]; then + error 'group is not in sync with gshadow!' + r=1 + fi + + return $r +} + +build() { + cd ${srcdir} + + lint + + a2x -d manpage -f manpage parabola.7.txt +} + +package() { + cd ${pkgdir} + + # + # setup root filesystem + # + for d in boot dev etc home mnt usr var opt srv/http run; do + install -d -m755 ${d} + done + install -d -m555 proc + install -d -m555 sys + install -d -m0750 root + install -d -m1777 tmp + # vsftpd won't run with write perms on /srv/ftp + install -d -m555 -g ftp srv/ftp + + # setup /etc + install -d etc/{ld.so.conf.d,skel,profile.d} + for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do + install -m644 ${srcdir}/${f} etc/ + done + ln -s /proc/self/mounts etc/mtab + for f in gshadow shadow crypttab; do + install -m600 ${srcdir}/${f} etc/ + done + touch etc/parabola-release + ln -sv parabola-release etc/arch-release + install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf + install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh + install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release + + # setup /var + for d in cache/man local opt log/old lib/misc empty; do + install -d -m755 var/${d} + done + install -d -m1777 var/{tmp,spool/mail} + # allow setgid games to write scores + install -d -m775 -g games var/games + ln -s spool/mail var/mail + ln -s ../run var/run + ln -s ../run/lock var/lock + + # + # setup /usr hierarchy + # + for d in bin include lib share/misc src; do + install -d -m755 usr/${d} + done + for d in $(seq 8); do + install -d -m755 usr/share/man/man${d} + done + + # + # add lib symlinks + # + ln -s usr/lib ${pkgdir}/lib + [[ ${CARCH} = "x86_64" ]] && ( + ln -s usr/lib ${pkgdir}/lib64 + ln -s lib ${pkgdir}/usr/lib64 + ) + [[ ${CARCH} = "mips64el" ]] && ( + # For the N32 ABI. + ln -s usr/lib ${pkgdir}/lib32 + ln -s lib ${pkgdir}/usr/lib32 + ) + + # + # add bin symlinks + # + ln -s usr/bin ${pkgdir}/bin + ln -s usr/bin ${pkgdir}/sbin + ln -s bin ${pkgdir}/usr/sbin + + # + # install parabola(7) manpage + # + install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 + + # + # setup /usr/local hierarchy + # + for d in bin etc games include lib man sbin share src; do + install -d -m755 usr/local/${d} + done + ln -s ../man usr/local/share/man +} diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab new file mode 100644 index 000000000..195945a74 --- /dev/null +++ b/libre/filesystem/crypttab @@ -0,0 +1,17 @@ +# crypttab: mappings for encrypted partitions +# +# Each mapped device will be created in /dev/mapper, so your /etc/fstab +# should use the /dev/mapper/ paths for encrypted devices. +# +# The Arch specific syntax has been deprecated, see crypttab(5) for the +# new supported syntax. +# +# NOTE: Do not list your root (/) partition here, it must be set up +# beforehand by the initramfs (/etc/mkinitcpio.conf). + +# +# home /dev/hda4 /etc/mypassword1 +# data1 /dev/hda3 /etc/mypassword2 +# data2 /dev/hda5 /etc/cryptfs.key +# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 +# vol /dev/hdb7 none diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install new file mode 100644 index 000000000..d70906f47 --- /dev/null +++ b/libre/filesystem/filesystem.install @@ -0,0 +1,79 @@ +# args: [options] +_addgroup() { + if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then + need_group_update=1 + fi +} + +# args: [options] +_adduser() { + if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then + need_passwd_update=1 + fi +} + +post_install() { + _backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' + 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') + for _bk in ${_backup[@]}; do + if [ -f ${_bk}.pacsave ]; then + cp -av ${_bk}{.pacsave,} + fi + done +} + +post_upgrade() { + _addgroup optical -g 93 + _addgroup audio -g 92 + _addgroup video -g 91 + _addgroup floppy -g 94 + _addgroup storage -g 95 + _addgroup log -g 19 + _addgroup utmp -g 20 + _addgroup power -g 98 + _addgroup network -g 90 + _addgroup games -g 50 + _addgroup uucp -g 14 + _addgroup http -g 33 + _adduser http -u 33 -d /srv/http -g http -s /usr/bin/nologin + _addgroup scanner -g 96 + _addgroup rfkill -g 24 + _addgroup lock -g 54 + _addgroup uuidd -g 68 + _adduser uuidd -u 68 -d / -g uuidd -s /usr/bin/nologin + _addgroup dbus -g 81 + _adduser dbus -u 81 -d / -g dbus -s /usr/bin/nologin + _addgroup input -g 97 + _addgroup systemd-journal -g 190 + _addgroup systemd-journal-gateway -g 191 + _adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin + _addgroup systemd-timesync -g 192 + _adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin + _addgroup systemd-network -g 193 + _adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin + _addgroup systemd-bus-proxy -g 194 + _adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin + _addgroup systemd-resolve -g 195 + _adduser systemd-resolve -u 195 -g 195 -d / -s /usr/bin/nologin + + # update shadow files if needed + if (( need_group_update )); then + grpconv >/dev/null + fi + + if (( need_passwd_update )); then + pwconv >/dev/null + fi + + if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then + echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf + fi + + # set "Last password change" > 0; otherwise su $user wont work + for user in bin daemon mail ftp http nobody; do + if LANG=C chage -l ${user} | grep -q 'password must be changed'; then + chage -d 14871 ${user} + fi + done +} diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab new file mode 100644 index 000000000..b6716c14a --- /dev/null +++ b/libre/filesystem/fstab @@ -0,0 +1,4 @@ +# +# /etc/fstab: static file system information +# +# diff --git a/libre/filesystem/group b/libre/filesystem/group new file mode 100644 index 000000000..ebfb87169 --- /dev/null +++ b/libre/filesystem/group @@ -0,0 +1,41 @@ +root:x:0:root +bin:x:1:root,bin,daemon +daemon:x:2:root,bin,daemon +sys:x:3:root,bin +adm:x:4:root,daemon +tty:x:5: +disk:x:6:root +lp:x:7:daemon +mem:x:8: +kmem:x:9: +wheel:x:10:root +ftp:x:11: +mail:x:12: +uucp:x:14: +log:x:19:root +utmp:x:20: +locate:x:21: +rfkill:x:24: +smmsp:x:25: +http:x:33: +games:x:50: +lock:x:54: +uuidd:x:68: +dbus:x:81: +network:x:90: +video:x:91: +audio:x:92: +optical:x:93: +floppy:x:94: +storage:x:95: +scanner:x:96: +input:x:97: +power:x:98: +nobody:x:99: +users:x:100: +systemd-journal:x:190: +systemd-journal-gateway:x:191: +systemd-timesync:x:192: +systemd-network:x:193: +systemd-bus-proxy:x:194: +systemd-resolve:x:195: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow new file mode 100644 index 000000000..1fcb075bc --- /dev/null +++ b/libre/filesystem/gshadow @@ -0,0 +1,41 @@ +root:::root +bin:::root,bin,daemon +daemon:::root,bin,daemon +sys:::root,bin +adm:::root,daemon +tty::: +disk:::root +lp:::daemon +mem::: +kmem::: +wheel:::root +ftp::: +mail::: +uucp::: +log:::root +utmp:x:: +locate::: +rfkill:x:: +smmsp::: +http::: +games::: +lock::: +uuidd:x:: +dbus:x:: +network:x:: +video:x:: +audio::: +optical::: +floppy:x:: +storage:x:: +scanner:x:: +input:x:: +power:x:: +nobody::: +users::: +systemd-journal::: +systemd-journal-gateway::: +systemd-timesync::: +systemd-network::: +systemd-bus-proxy::: +systemd-resolve::: diff --git a/libre/filesystem/host.conf b/libre/filesystem/host.conf new file mode 100644 index 000000000..cf52fe561 --- /dev/null +++ b/libre/filesystem/host.conf @@ -0,0 +1,8 @@ +# +# /etc/host.conf +# + +order hosts,bind +multi on + +# End of file diff --git a/libre/filesystem/hosts b/libre/filesystem/hosts new file mode 100644 index 000000000..1747f9196 --- /dev/null +++ b/libre/filesystem/hosts @@ -0,0 +1,9 @@ +# +# /etc/hosts: static lookup table for host names +# + +# +127.0.0.1 localhost.localdomain localhost +::1 localhost.localdomain localhost + +# End of file diff --git a/libre/filesystem/issue b/libre/filesystem/issue new file mode 100644 index 000000000..b001c55dd --- /dev/null +++ b/libre/filesystem/issue @@ -0,0 +1,2 @@ +Parabola GNU/Linux-libre \r (\n) (\l) + diff --git a/libre/filesystem/ld.so.conf b/libre/filesystem/ld.so.conf new file mode 100644 index 000000000..dfac45683 --- /dev/null +++ b/libre/filesystem/ld.so.conf @@ -0,0 +1,7 @@ +# +# /etc/ld.so.conf +# + +include /etc/ld.so.conf.d/*.conf + +# End of file diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh new file mode 100644 index 000000000..3cfc89c1b --- /dev/null +++ b/libre/filesystem/locale.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ + LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION + +if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" +elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" +elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf +fi + +LANG=${LANG:-C} +export LANG +[ -n "$LC_CTYPE" ] && export LC_CTYPE +[ -n "$LC_NUMERIC" ] && export LC_NUMERIC +[ -n "$LC_TIME" ] && export LC_TIME +[ -n "$LC_COLLATE" ] && export LC_COLLATE +[ -n "$LC_MONETARY" ] && export LC_MONETARY +[ -n "$LC_MESSAGES" ] && export LC_MESSAGES +[ -n "$LC_PAPER" ] && export LC_PAPER +[ -n "$LC_NAME" ] && export LC_NAME +[ -n "$LC_ADDRESS" ] && export LC_ADDRESS +[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE +[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT +[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/libre/filesystem/modprobe.d.usb-load-ehci-first b/libre/filesystem/modprobe.d.usb-load-ehci-first new file mode 100644 index 000000000..947379411 --- /dev/null +++ b/libre/filesystem/modprobe.d.usb-load-ehci-first @@ -0,0 +1,2 @@ +softdep ohci_hcd pre: ehci_hcd +softdep uhci_hcd pre: ehci_hcd diff --git a/libre/filesystem/motd b/libre/filesystem/motd new file mode 100644 index 000000000..e69de29bb diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf new file mode 100644 index 000000000..4a4f5770d --- /dev/null +++ b/libre/filesystem/nsswitch.conf @@ -0,0 +1,19 @@ +# Begin /etc/nsswitch.conf + +passwd: files +group: files +shadow: files + +publickey: files + +hosts: files dns myhostname +networks: files + +protocols: files +services: files +ethers: files +rpc: files + +netgroup: files + +# End /etc/nsswitch.conf diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release new file mode 100644 index 000000000..fe5f20b4f --- /dev/null +++ b/libre/filesystem/os-release @@ -0,0 +1,8 @@ +NAME="Parabola" +ID=parabola +ID_LIKE=arch +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" +HOME_URL="https://parabolagnulinux.org/" +BUG_REPORT_URL="https://labs.parabola.nu/" + diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt new file mode 100644 index 000000000..60e1121e0 --- /dev/null +++ b/libre/filesystem/parabola.7.txt @@ -0,0 +1,91 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet: +///// +parabola(7) +============ + +NAME +---- +parabola - basic configuration + +SYNOPSIS +-------- +Overview of the basic configuration of Parabola GNU/Linux-libre. + +DESCRIPTION +----------- +Parabola exposes the user to the system without hiding any details. +This man page gives a brief overview of the configuration files that should be set up on a fresh install. + +SYSTEM SERVICES[[S]] +-------------------- +System services to be started at boot can be enabled using 'systemctl enable '. +To view available services, use 'systemctl list-unit-files'. + +HOSTNAME[[H]] +------------- +The hostname of the machine can be set using 'hostnamectl set-hostname '. +It will then be written to /etc/hostname. + +LOCALIZATION[[L]] +----------------- +Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'. +The system-wide locale to be used can be configured in /etc/locale.conf. +These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf. +The user-specific file will take precedence if it exists. + +VIRTUAL CONSOLE[[V]] +-------------------- +The virtual console is configured in /etc/vconsole.conf. +It allows you to set a font and a keyboard layout, among other things. +Note that these settings only apply to the console and do not apply if you use X. + +TIME[[T]] +--------- +The local time zone is configured by calling 'timedatectl set-timezone '. +A relative *symlink* is then created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. For example, + + /etc/localtime -> ../usr/share/zoneinfo/Europe/Paris + +The real-time clock, which keeps track of time when the computer is off, can be configured to either +be in UTC or in local time by calling 'timedatectl set-local-rtc '. +The default is UTC. + +FILE SYSTEMS[[F]] +----------------- +File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. + +INITRAMFS[[R]] +-------------- +The initramfs is generated by 'mkinitcpio -p '. +The default preset is "linux-libre". +The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes. + +PACKAGE MANAGER[[P]] +-------------------- +The package manager, pacman, is configured in /etc/pacman.conf. + +BOOT LOADER[[B]] +---------------- +GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'. +Syslinux is configured in /boot/syslinux/syslinux.cfg. + +MODULES[[M]] +------------ +Most modules should be loaded on-demand. +Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, +and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/. + +SEE ALSO +-------- + +*systemctl*(1), *hostnamectl*(1), *hostname*(5), *locale.conf*(5), +*vconsole.conf*(5), *timedatectl*(1), *timezone*(3), *hwclock*(8), +*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5), +*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5), +*systemd*(1) + +AUTHORS +------- +Written by Tom Gundersen. +Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd new file mode 100644 index 000000000..b3e79eb9d --- /dev/null +++ b/libre/filesystem/passwd @@ -0,0 +1,14 @@ +root:x:0:0:root:/root:/bin/bash +bin:x:1:1:bin:/bin:/usr/bin/nologin +daemon:x:2:2:daemon:/:/usr/bin/nologin +mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin +ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin +http:x:33:33:http:/srv/http:/usr/bin/nologin +uuidd:x:68:68:uuidd:/:/usr/bin/nologin +dbus:x:81:81:dbus:/:/usr/bin/nologin +nobody:x:99:99:nobody:/:/usr/bin/nologin +systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin +systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin +systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin +systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin +systemd-resolve:x:195:195:systemd-resolve:/:/usr/bin/nologin diff --git a/libre/filesystem/profile b/libre/filesystem/profile new file mode 100644 index 000000000..59d0abc83 --- /dev/null +++ b/libre/filesystem/profile @@ -0,0 +1,27 @@ +# /etc/profile + +#Set our umask +umask 022 + +# Set our default path +PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" +export PATH + +# Load profiles from /etc/profile.d +if test -d /etc/profile.d/; then + for profile in /etc/profile.d/*.sh; do + test -r "$profile" && . "$profile" + done + unset profile +fi + +# Source global bash config +if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then + . /etc/bash.bashrc +fi + +# Termcap is outdated, old, and crusty, kill it. +unset TERMCAP + +# Man is much better than us at figuring this out +unset MANPATH diff --git a/libre/filesystem/resolv.conf b/libre/filesystem/resolv.conf new file mode 100644 index 000000000..cecafba03 --- /dev/null +++ b/libre/filesystem/resolv.conf @@ -0,0 +1,8 @@ +# +# /etc/resolv.conf +# + +#search +#nameserver + +# End of file diff --git a/libre/filesystem/securetty b/libre/filesystem/securetty new file mode 100644 index 000000000..5a2235ce7 --- /dev/null +++ b/libre/filesystem/securetty @@ -0,0 +1,15 @@ +# +# /etc/securetty +# + +console +tty1 +tty2 +tty3 +tty4 +tty5 +tty6 +ttyS0 +hvc0 + +# End of file diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow new file mode 100644 index 000000000..4c6e3d18f --- /dev/null +++ b/libre/filesystem/shadow @@ -0,0 +1,14 @@ +root::14871:::::: +bin:x:14871:::::: +daemon:x:14871:::::: +mail:x:14871:::::: +ftp:x:14871:::::: +http:x:14871:::::: +uuidd:x:14871:::::: +dbus:x:14871:::::: +nobody:x:14871:::::: +systemd-journal-gateway:x:14871:::::: +systemd-timesync:x:14871:::::: +systemd-network:x:14871:::::: +systemd-bus-proxy:x:14871:::::: +systemd-resolve:x:14871:::::: diff --git a/libre/filesystem/shells b/libre/filesystem/shells new file mode 100644 index 000000000..18c1aeffa --- /dev/null +++ b/libre/filesystem/shells @@ -0,0 +1,8 @@ +# +# /etc/shells +# + +/bin/sh +/bin/bash + +# End of file diff --git a/libre/gnormalize-parabola/PKGBUILD b/libre/gnormalize-parabola/PKGBUILD deleted file mode 100644 index edcb448a5..000000000 --- a/libre/gnormalize-parabola/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Chris Brannon -# Contributor (Arch): Corrado Primier -# Contributor (Arch):JZsolt Varadi (karmaxxl) -# Maintainer: André Silva - -_pkgname=gnormalize -pkgname=gnormalize-parabola -pkgver=0.63 -pkgrel=5 -pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation' -arch=('any') -url='http://gnormalize.sourceforge.net/' -license=('GPL') -depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme') -makedepends=('xz' 'gendesk') -optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' - 'lame: MP3 encoding' - 'mpg321: MP3 playing' - 'mplayer: FLAC/WAV playing' - 'musepack-tools: full Musepack support' - 'perl-mp3-info: MP3 ID3 tags' - 'vorbis-tools: full OGG Vorbis support' - 'cdcd: CD playing' - 'cdparanoia: CD ripping' - 'cdrkit: CD ripping - alternative to cdparanoia' - 'wavegain: sound normalization') -replaces=("${_pkgname}" "${_pkgname}-libre") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=(${_pkgname}=${pkgver}) -install=gnormalize.install -source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz") -sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6') - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - - gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \ - 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' - lzma -qd gnormalize.1.lzma -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1" - install -d "$pkgdir/usr/share/$_pkgname/animations" - install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/" - install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README" - install -Dm644 "icons/$_pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$_pkgname.png" - for i in 16 32 48 ; do - install -Dm644 "icons/gnormalize-$i.png" \ - "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png" - done - install -Dm644 "$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/gnormalize-parabola/gnormalize.desktop b/libre/gnormalize-parabola/gnormalize.desktop deleted file mode 100644 index 4d4061308..000000000 --- a/libre/gnormalize-parabola/gnormalize.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=gnormalize -Comment=Encoder/Decoder, normalize frontend, etc. -Exec=gnormalize -Icon=gnormalize -MimeType=audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg; -Categories=GTK;AudioVideo;Player; -Terminal=false -Type=Application diff --git a/libre/gnormalize-parabola/gnormalize.install b/libre/gnormalize-parabola/gnormalize.install deleted file mode 100644 index ef533df53..000000000 --- a/libre/gnormalize-parabola/gnormalize.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/gnormalize/PKGBUILD b/libre/gnormalize/PKGBUILD new file mode 100644 index 000000000..28765dbdc --- /dev/null +++ b/libre/gnormalize/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Chris Brannon +# Contributor (Arch): Corrado Primier +# Contributor (Arch):JZsolt Varadi (karmaxxl) +# Maintainer: André Silva + +pkgname=gnormalize +pkgver=0.63 +pkgrel=5.parabola1 +pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation' +arch=('any') +url='http://gnormalize.sourceforge.net/' +license=('GPL') +depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme') +makedepends=('xz' 'gendesk') +optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' + 'lame: MP3 encoding' + 'mpg321: MP3 playing' + 'mplayer: FLAC/WAV playing' + 'musepack-tools: full Musepack support' + 'perl-mp3-info: MP3 ID3 tags' + 'vorbis-tools: full OGG Vorbis support' + 'cdcd: CD playing' + 'cdparanoia: CD ripping' + 'cdrkit: CD ripping - alternative to cdparanoia' + 'wavegain: sound normalization') +replaces=("${pkgname}-libre" "${pkgname}-parabola") +conflicts=("${pkgname}-libre" "${pkgname}-parabola") +install=gnormalize.install +source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz") +sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --mimetypes \ + 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' + lzma -qd gnormalize.1.lzma +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1" + install -d "$pkgdir/usr/share/$pkgname/animations" + install -m644 animations/*.gif "$pkgdir/usr/share/$pkgname/animations/" + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" + install -Dm644 "icons/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + for i in 16 32 48 ; do + install -Dm644 "icons/gnormalize-$i.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png" + done + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/gnormalize/gnormalize.desktop b/libre/gnormalize/gnormalize.desktop new file mode 100644 index 000000000..4d4061308 --- /dev/null +++ b/libre/gnormalize/gnormalize.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=gnormalize +Comment=Encoder/Decoder, normalize frontend, etc. +Exec=gnormalize +Icon=gnormalize +MimeType=audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg; +Categories=GTK;AudioVideo;Player; +Terminal=false +Type=Application diff --git a/libre/gnormalize/gnormalize.install b/libre/gnormalize/gnormalize.install new file mode 100644 index 000000000..ef533df53 --- /dev/null +++ b/libre/gnormalize/gnormalize.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch deleted file mode 100644 index e043633af..000000000 --- a/libre/grub-parabola/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Fri, 28 Dec 2012 06:43:35 +0000 -Subject: [PATCH 069/364] Backport gnulib fixes for C11. Fixes Savannah bug - #37738. - -* grub-core/gnulib/stdio.in.h (gets): Warn on use only if -HAVE_RAW_DECL_GETS. -* m4/stdio_h.m4 (gl_STDIO_H): Check for gets. ---- - ChangeLog | 8 ++++++++ - grub-core/gnulib/stdio.in.h | 6 ++++-- - m4/stdio_h.m4 | 2 +- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h -index 80b9dbf..a8b00c6 100644 ---- a/grub-core/gnulib/stdio.in.h -+++ b/grub-core/gnulib/stdio.in.h -@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - #endif - - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ - #undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 -index f5650cd..8458bec 100644 ---- a/m4/stdio_h.m4 -+++ b/m4/stdio_h.m4 -@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H], - dnl corresponding gnulib module is not in use, and which is not - dnl guaranteed by C89. - gl_WARN_ON_USE_PREPARE([[#include -- ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat -+ ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat - snprintf tmpfile vdprintf vsnprintf]) - ]) - --- -1.8.1.4 - diff --git a/libre/grub-parabola/09_parabola b/libre/grub-parabola/09_parabola deleted file mode 100644 index 90a9062a3..000000000 --- a/libre/grub-parabola/09_parabola +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/bin/env bash - -## -## grub-mkconfig helper script specific to Parabola GNU/Linux-libre -## Contributed by "Keshav Amburay" -## Rebranded for Parabola by "André Silva" -## Updated on 08 February 2014 -## -## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script -## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream -## -## This script can be freely distributed and/or modified -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This script is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -_FUNC_GRUB_FILE_PRESENT() { - - [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" - - if [[ "${GRUB_PLATFORM}" == "x86" ]]; then - check="--is-x86-linux32" - elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then - check="--is-i386-xen-pae-domu" - elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then - check="--is-x86_64-xen-domu" - else - check="--is-${GRUB_PLATFORM}-linux" - fi - - case "${GRUB_PLATFORM}" in - x86) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - *) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - esac -} - -set -e - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" -datadir="${datarootdir}" -sysconfdir="/etc" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -. "${sysconfdir}/default/grub" - -export TEXTDOMAIN="grub" -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class parabola --class gnu-linux --class gnu --class os" - -[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT - -BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" -BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" -BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" - -ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" -ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" - -if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then - - case "${ROOT_PART_FS}" in - btrfs) - rootsubvol="$(make_system_path_relative_to_its_root /)" - rootsubvol="${rootsubvol#/}" - if [[ "${rootsubvol}" != "" ]]; then - GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" - fi - ;; - zfs) - rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" - bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" - GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" - ;; - esac - - if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ - [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ - [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ - uses_abstraction "${GRUB_DEVICE}" lvm ; then - GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" - else - GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" - fi -fi - -[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - -for _KERNEL_ in ${list} ; do - - echo "Found linux image: ${_KERNEL_}" >&2 - - basename="$(basename "${_KERNEL_}")" - dirname="$(dirname "${_KERNEL_}")" - REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" - - _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" - _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" - - _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" - - if [[ -e "/boot/${_INITRAMFS_}" ]]; then - - echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_} -} - -EOF - fi - - _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" - - if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then - - echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} -} - -EOF - fi - - if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} -} - -EOF - fi - -done diff --git a/libre/grub-parabola/60_memtest86+ b/libre/grub-parabola/60_memtest86+ deleted file mode 100644 index 086f0cc84..000000000 --- a/libre/grub-parabola/60_memtest86+ +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then - ## image exists, create menu entry - echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2 - _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})" - _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" - _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" - cat << EOF -if [ "\${grub_platform}" == "pc" ]; then - menuentry "Memory Tester (memtest86+)" ${CLASS} { - search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} - linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} - } -fi -EOF -fi diff --git a/libre/grub-parabola/PKGBUILD b/libre/grub-parabola/PKGBUILD deleted file mode 100644 index a4c4bfb9f..000000000 --- a/libre/grub-parabola/PKGBUILD +++ /dev/null @@ -1,385 +0,0 @@ -# Maintainer (Arch): Tobias Powalowski -# Maintainer (Arch): Ronald van Haren -# Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer: André Silva -# Contributor: Márcio Silva - -## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable -_IA32_EFI_IN_ARCH_X64="1" - -## "1" to enable EMU build, "0" to disable -_GRUB_EMU_BUILD="0" - -_pkgver="2.02" -_GRUB_GIT_TAG="grub-2.02-beta2" - -_UNIFONT_VER="6.3.20131217" - -[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" - -[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" - -_pkgname="grub" -pkgname="grub-parabola" -pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.02.beta2 -pkgrel=4 -epoch="1" -url="https://www.gnu.org/software/grub/" -arch=('x86_64' 'i686') -license=('GPL3') -backup=('etc/default/grub' 'etc/grub.d/40_custom') -install="${_pkgname}.install" -options=('!makeflags') - -conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub') -replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub') -provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" "grub=$pkgver") - -makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') -depends=('sh' 'xz' 'gettext' 'device-mapper') -optdepends=('freetype2: For grub-mkfont usage' - 'fuse: For grub-mount usage' - 'dosfstools: For grub-mkrescue FAT FS and EFI support' - 'efibootmgr: For grub-install EFI support' - 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - -if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then - makedepends+=('libusbx' 'sdl') - optdepends+=('libusbx: For grub-emu USB support' - 'sdl: For grub-emu SDL support') -fi - -source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}" - "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master" - "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz" - "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig" - 'grub-10_linux-detect-parabola-initramfs.patch' - 'grub-add-GRUB_COLOR_variables.patch' - '60_memtest86+' - 'grub.default' - 'grub-10_linux-rebrand-free-distros.patch') - -md5sums=('SKIP' - 'SKIP' - '728b7439ac733a7c0d56049adec364c7' - 'SKIP' - '945527e0de8d384166a4cf23439ae9ee' - 'e506ae4a9f9f7d1b765febfa84e10d48' - 'be55eabc102f2c60b38ed35c203686d6' - '8d1dd54ae4a1b550c097e056892ce953' - 'c8ac993bc9c0fe288c177a20630ccc46') - -_pkgver() { - cd "${srcdir}/grub-${_pkgver}/" - echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g' -} - -prepare() { - - cd "${srcdir}/grub-${_pkgver}/" - - msg "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig" - patch -Np1 -i "${srcdir}/grub-10_linux-detect-parabola-initramfs.patch" - echo - - msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig" - ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch" - echo - - msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme" - sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" - - msg "Rebranding for some free distros" - patch -Np1 -i "${srcdir}/grub-10_linux-rebrand-free-distros.patch" - echo - - msg "Fix mkinitcpio 'rw' FS#36275" - sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" - - # msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3" - # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" - - msg "Pull in latest language files" - ./linguas.sh - echo - - msg "Remove not working langs which need LC_ALL=C.UTF-8" - sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" - - msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847" - cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" - -} - -_build_grub-common_and_bios() { - - msg "Set ARCH dependent variables for bios build" - if [[ "${CARCH}" == 'x86_64' ]]; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi - - msg "Copy the source for building the bios part" - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios" - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Add the grub-extra sources for bios build" - install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" - export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/" - - msg "Unset all compiler FLAGS for bios build" - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Run autogen.sh for bios build" - ./autogen.sh - echo - - msg "Run ./configure for bios build" - ./configure \ - --with-platform="pc" \ - --target="i386" \ - "${_EFIEMU}" \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-boot-time \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-silent-rules \ - --disable-werror - echo - - msg "Run make for bios build" - make - echo -} - -_build_grub-efi() { - - msg "Copy the source for building the ${_EFI_ARCH} efi part" - cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}" - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build" - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Run autogen.sh for ${_EFI_ARCH} efi build" - ./autogen.sh - echo - - msg "Run ./configure for ${_EFI_ARCH} efi build" - ./configure \ - --with-platform="efi" \ - --target="${_EFI_ARCH}" \ - --disable-efiemu \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-boot-time \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-silent-rules \ - --disable-werror - echo - - msg "Run make for ${_EFI_ARCH} efi build" - make - echo - -} - -_build_grub-emu() { - - msg "Copy the source for building the emu part" - cp -r "${srcdir}/grub-${_pkgver}/" "${srcdir}/grub-${_pkgver}-emu/" - - msg "Unset all compiler FLAGS for emu build" - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - cd "${srcdir}/grub-${_pkgver}-emu/" - - msg "Run autogen.sh for emu build" - ./autogen.sh - echo - - msg "Run ./configure for emu build" - ./configure \ - --with-platform="emu" \ - --target="${_EMU_ARCH}" \ - --enable-mm-debug \ - --enable-nls \ - --enable-device-mapper \ - --enable-cache-stats \ - --enable-grub-mkfont \ - --enable-grub-mount \ - --enable-grub-emu-usb=no \ - --enable-grub-emu-sdl=no \ - --disable-grub-emu-pci \ - --prefix="/usr" \ - --bindir="/usr/bin" \ - --sbindir="/usr/bin" \ - --mandir="/usr/share/man" \ - --infodir="/usr/share/info" \ - --datarootdir="/usr/share" \ - --sysconfdir="/etc" \ - --program-prefix="" \ - --with-bootdir="/boot" \ - --with-grubdir="grub" \ - --disable-silent-rules \ - --disable-werror - echo - - msg "Run make for emu build" - make - echo - -} - -build() { - - cd "${srcdir}/grub-${_pkgver}/" - - msg "Build grub bios stuff" - _build_grub-common_and_bios - echo - - msg "Build grub ${_EFI_ARCH} efi stuff" - _build_grub-efi - echo - - if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then - msg "Build grub i386 efi stuff" - _EFI_ARCH="i386" _build_grub-efi - echo - fi - - if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then - msg "Build grub emu stuff" - _build_grub-emu - echo - fi - -} - -_package_grub-common_and_bios() { - - cd "${srcdir}/grub-${_pkgver}-bios/" - - msg "Run make install for bios build" - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo - - msg "Remove gdb debugging related files for bios build" - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - - msg "Install extra /etc/grub.d/ files" - install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" - - msg "Install /etc/default/grub (used by grub-mkconfig)" - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - -} - -_package_grub-efi() { - - cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" - - msg "Run make install for ${_EFI_ARCH} efi build" - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo - - msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build" - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true - -} - -_package_grub-emu() { - - cd "${srcdir}/grub-${_pkgver}-emu/" - - msg "Run make install for emu build" - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo - - msg "Remove gdb debugging related files for emu build" - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true - -} - -package() { - - cd "${srcdir}/grub-${_pkgver}/" - - msg "Package grub ${_EFI_ARCH} efi stuff" - _package_grub-efi - - if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then - msg "Package grub i386 efi stuff" - _EFI_ARCH="i386" _package_grub-efi - echo - fi - - if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then - msg "Package grub emu stuff" - _package_grub-emu - echo - fi - - msg "Package grub bios stuff" - _package_grub-common_and_bios - -} diff --git a/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch deleted file mode 100644 index 18d9d520c..000000000 --- a/libre/grub-parabola/grub-10_linux-detect-parabola-initramfs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b470ffd22e43acc7c11231180187a720efd88de1 Mon Sep 17 00:00:00 2001 -From: Keshav Amburay -Date: Sat, 5 Apr 2014 20:40:51 -0400 -Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs - images - ---- - util/grub.d/10_linux.in | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 00d1931..7d4086b 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -81,6 +81,8 @@ linux_entry () - case $type in - recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;; - *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; - esac -@@ -180,7 +182,7 @@ while [ "x$list" != "x" ] ; do - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` -- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -+ version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -@@ -236,6 +238,18 @@ while [ "x$list" != "x" ] ; do - - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="initramfs-${version}-fallback.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" --- -1.9.1 - diff --git a/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch b/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch deleted file mode 100644 index 7edb22a1f..000000000 --- a/libre/grub-parabola/grub-10_linux-rebrand-free-distros.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 00d1931..23de7ce 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os" - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - diff --git a/libre/grub-parabola/grub-2.00-fix-docs.patch b/libre/grub-parabola/grub-2.00-fix-docs.patch deleted file mode 100644 index 0aa481154..000000000 --- a/libre/grub-parabola/grub-2.00-fix-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001 -From: Ray Strode - ---- - util/getroot.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/util/getroot.c b/util/getroot.c -index 2ad8a55..3afcf96 100644 ---- a/util/getroot.c -+++ b/util/getroot.c -@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev) - static void - pull_lvm_by_command (const char *os_dev) - { -- char *argv[6]; -+ char *argv[8]; - int fd; - pid_t pid; - FILE *mdadm; -@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev) - - /* execvp has inconvenient types, hence the casts. None of these - strings will actually be modified. */ -+ /* by default PV name is left aligned in 10 character field, meaning that -+ we do not know where name ends. Using dummy --separator disables -+ alignment. We have a single field, so separator itself is not output */ - argv[0] = (char *) "vgs"; - argv[1] = (char *) "--options"; - argv[2] = (char *) "pv_name"; - argv[3] = (char *) "--noheadings"; -- argv[4] = vgname; -- argv[5] = NULL; -+ argv[4] = (char *) "--separator"; -+ argv[5] = (char *) ":"; -+ argv[6] = vgname; -+ argv[7] = NULL; - - pid = exec_pipe (argv, &fd); - free (vgname); -@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev) - while (getline (&buf, &len, mdadm) > 0) - { - char *ptr; -+ /* LVM adds two spaces as standard prefix */ - for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++); - if (*ptr == '\0') - continue; diff --git a/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch b/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch deleted file mode 100644 index c113a81d5..000000000 --- a/libre/grub-parabola/grub-add-GRUB_COLOR_variables.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 3390ba9..c416489 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index d2e7252..8259f45 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -125,6 +125,14 @@ cat <