From a99d37e8cf3cefec2e59be2afc507559b3e94f6a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 25 May 2016 18:42:35 -0300 Subject: sagemath-7.2-3.parabola1: rebuild against fflas-ffpack 2.2.1-7 to remove SSE4 symbols - FS#49408 -> https://bugs.archlinux.org/task/49408 * add python2-pkgconfig optdepend --- libre/sagemath/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD index e074b7bc0..6569777ed 100644 --- a/libre/sagemath/PKGBUILD +++ b/libre/sagemath/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175566 2016-05-17 19:19:04Z arojas $ +# $Id: PKGBUILD 176664 2016-05-25 06:44:10Z arojas $ # Maintainer (Arch): Evgeniy Alekseev # Maintainer (Arch): Antonio Rojas # Contributor (Arch): Daniel Wallace @@ -11,7 +11,7 @@ pkgname=sagemath pkgver=7.2 -pkgrel=2.parabola1 +pkgrel=3.parabola1 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty support" arch=(i686 x86_64 armv7h) url="http://www.sagemath.org" @@ -20,7 +20,8 @@ depends=(ipython2 cysignals ppl mpfi palp brial singular cliquer maxima-ecl gfan python2-matplotlib python2-scipy python2-sympy python2-networkx python2-igraph python2-pillow libgap flintqs lcalc lrcalc arb eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials) -optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' +optdepends=('cython2: to compile cython code' 'python2-pkgconfig: to compile cython code' + 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' 'sagemath-doc: Documentation and inline help' 'ipython2-notebook: Jupyter notebook interface' 'mathjax: Jupyter notebook interface' 'coin-or-cbc: COIN backend for numerical computations' 'coin-or-csdp: for computing Lovász theta-function of graphs' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' -- cgit v1.2.3 From 3d271810cb33579af657475407a5c3157375cb80 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 12:49:37 -0400 Subject: libre/systemd: Split gnu+linux.patch into multiple patches, tidy them up. I removed several instances of replacing "Linux" with "GNU/Linux" in man pages where it was (correctly) referring to kernel, not the complete operating system. In the FSDG-distros patch, I added " (Spartakus)" to several BLAG examples, as appropriate. Also, some of the linebreaks were in bad locations with the XML. I also added a patch to systemd-resolved to have the default hostname be "gnu-linux[.local]" instead of "linux[.local]". --- ...efer-to-the-operating-system-as-GNU-Linux.patch | 80 ++++ ...ease-Default-to-PRETTY_NAME-GNU-Linux-ins.patch | 96 ++++ ...ease-Default-to-NAME-GNU-Linux-instead-of.patch | 40 ++ ...ease-Default-ID-to-gnu-linux-instead-of-l.patch | 28 ++ ...d-resolved-Default-to-hostname-gnu-linux-.patch | 33 ++ ...an-Use-FSDG-operating-systems-as-examples.patch | 199 +++++++++ libre/systemd/PKGBUILD | 24 +- libre/systemd/gnu+linux.patch | 493 --------------------- 8 files changed, 493 insertions(+), 500 deletions(-) create mode 100644 libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch create mode 100644 libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch create mode 100644 libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch create mode 100644 libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch create mode 100644 libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch create mode 100644 libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch delete mode 100644 libre/systemd/gnu+linux.patch diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch new file mode 100644 index 000000000..e91d0afd8 --- /dev/null +++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -0,0 +1,80 @@ +From 64713f35b5a75b441ab300813ff5a48b0bffed92 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:19:20 -0400 +Subject: [PATCH 1/6] FSDG: man/: Refer to the operating system as GNU/Linux. + +This is not a blind replacement of "Linux" with "GNU/Linux". In some +cases, "Linux" is (correctly) used to refer to just the kernel. In others, +it is in a string for which code must also be adjusted; these instances +are not included in this commit. +--- + man/daemon.xml | 4 ++-- + man/sd-bus-errors.xml | 2 +- + man/sd_bus_error_add_map.xml | 2 +- + man/systemd.xml | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/man/daemon.xml b/man/daemon.xml +index b6125cb..f74fd35 100644 +--- a/man/daemon.xml ++++ b/man/daemon.xml +@@ -168,7 +168,7 @@ + + New-Style Daemons + +- Modern services for Linux should be implemented as ++ Modern services for GNU/Linux should be implemented as + new-style daemons. This makes it easier to supervise and control + them at runtime and simplifies their implementation. + +@@ -311,7 +311,7 @@ + as detailed in the LSB + Linux Standard Base Core Specification. This method of +- activation is supported ubiquitously on Linux init systems, both ++ activation is supported ubiquitously on GNU/Linux init systems, both + old-style and new-style systems. Among other issues, SysV init + scripts have the disadvantage of involving shell scripts in the + boot process. New-style init systems generally employ updated +diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml +index 055af7a..d2b81f4 100644 +--- a/man/sd-bus-errors.xml ++++ b/man/sd-bus-errors.xml +@@ -126,7 +126,7 @@ + + In addition to this list, in sd-bus, the special error + namespace System.Error. is used to map +- arbitrary Linux system errors (as defined by errno3) + to D-Bus errors and back. For example, the error + EUCLEAN is mapped to +diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml +index 139bd77..7dc1ef6 100644 +--- a/man/sd_bus_error_add_map.xml ++++ b/man/sd_bus_error_add_map.xml +@@ -82,7 +82,7 @@ + + The sd_bus_error_add_map() call may be + used to register additional mappings for converting D-Bus errors +- to Linux errno-style errors. The mappings ++ to GNU/Linux errno-style errors. The mappings + defined with this call are consulted by calls such as + sd_bus_error_set3 + or +diff --git a/man/systemd.xml b/man/systemd.xml +index b8d91b8..e05a9d6 100644 +--- a/man/systemd.xml ++++ b/man/systemd.xml +@@ -61,7 +61,7 @@ + + Description + +- systemd is a system and service manager for Linux operating ++ systemd is a system and service manager for GNU/Linux operating + systems. When run as first process on boot (as PID 1), it acts as + init system that brings up and maintains userspace + services. +-- +2.8.3 + diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch new file mode 100644 index 000000000..c247cb3ad --- /dev/null +++ b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch @@ -0,0 +1,96 @@ +From d6a67e5ff7d99af484a9ebf68d3fe2510bffd099 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:23:40 -0400 +Subject: [PATCH 2/6] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" + instead of "Linux". + +--- + man/kernel-install.xml | 2 +- + man/os-release.xml | 2 +- + src/analyze/analyze.c | 2 +- + src/core/main.c | 2 +- + src/firstboot/firstboot.c | 2 +- + src/kernel-install/90-loaderentry.install | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/man/kernel-install.xml b/man/kernel-install.xml +index d7e27de..eb51918 100644 +--- a/man/kernel-install.xml ++++ b/man/kernel-install.xml +@@ -106,7 +106,7 @@ + PRETTY_NAME parameter specified + in /etc/os-release or + /usr/lib/os-release (if the former is +- missing), or "Linux ++ missing), or "GNU/Linux + KERNEL-VERSION", if unset. If + the file initrd is found next to the + linux file, the initrd will be added to +diff --git a/man/os-release.xml b/man/os-release.xml +index 4557abc..767a1c7 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -194,7 +194,7 @@ + suitable for presentation to the user. May or may not contain + a release code name or OS version of some kind, as suitable. + If not set, defaults to +- PRETTY_NAME="Linux". Example: ++ PRETTY_NAME="GNU/Linux". Example: + PRETTY_NAME="Fedora 17 (Beefy + Miracle)". + +diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c +index a847084..1a28093 100644 +--- a/src/analyze/analyze.c ++++ b/src/analyze/analyze.c +@@ -660,7 +660,7 @@ static int analyze_plot(sd_bus *bus) { + svg("\n"); + svg("%s", pretty_times); + svg("%s %s (%s %s %s) %s %s", +- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name, ++ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name, + strempty(host->hostname), + strempty(host->kernel_name), + strempty(host->kernel_release), +diff --git a/src/core/main.c b/src/core/main.c +index e208857..5346392 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1233,7 +1233,7 @@ static int status_welcome(void) { + return status_printf(NULL, false, false, + "\nWelcome to \x1B[%sm%s\x1B[0m!\n", + isempty(ansi_color) ? "1" : ansi_color, +- isempty(pretty_name) ? "Linux" : pretty_name); ++ isempty(pretty_name) ? "GNU/Linux" : pretty_name); + } + + static int write_container_id(void) { +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index 7790ab8..8e57a24 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -96,7 +96,7 @@ static void print_welcome(void) { + log_warning_errno(r, "Failed to read os-release file: %m"); + + printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", +- isempty(pretty_name) ? "Linux" : pretty_name); ++ isempty(pretty_name) ? "GNU/Linux" : pretty_name); + + press_any_key(); + +diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install +index 4c9b1f0..6e94e12 100644 +--- a/src/kernel-install/90-loaderentry.install ++++ b/src/kernel-install/90-loaderentry.install +@@ -37,7 +37,7 @@ elif [[ -f /usr/lib/os-release ]]; then + fi + + if ! [[ $PRETTY_NAME ]]; then +- PRETTY_NAME="Linux $KERNEL_VERSION" ++ PRETTY_NAME="GNU/Linux $KERNEL_VERSION" + fi + + declare -a BOOT_OPTIONS +-- +2.8.3 + diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch new file mode 100644 index 000000000..d6c40587d --- /dev/null +++ b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch @@ -0,0 +1,40 @@ +From 20c90fb1a90a1702ce5e7d79dd16ee160640a1ee Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:24:56 -0400 +Subject: [PATCH 3/6] FSDG: os-release: Default to NAME "GNU/Linux" instead of + "Linux". + +--- + man/os-release.xml | 2 +- + src/journal-remote/journal-gatewayd.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 767a1c7..f6787f9 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -121,7 +121,7 @@ + A string identifying the operating system, + without a version component, and suitable for presentation to + the user. If not set, defaults to +- NAME=Linux. Example: ++ NAME=GNU/Linux. Example: + NAME=Fedora or NAME="Debian + GNU/Linux". + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index 60d8977..3b9adb5 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -799,7 +799,7 @@ static int request_handler_machine( + SD_ID128_FORMAT_VAL(mid), + SD_ID128_FORMAT_VAL(bid), + hostname_cleanup(hostname), +- os_name ? os_name : "Linux", ++ os_name ? os_name : "GNU/Linux", + v ? v : "bare", + usage, + cutoff_from, +-- +2.8.3 + diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch new file mode 100644 index 000000000..8a130ab78 --- /dev/null +++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -0,0 +1,28 @@ +From 6f4e352372876053efb168e6dc9e74a57c8d6c2e Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:28:30 -0400 +Subject: [PATCH 4/6] FSDG: os-release: Default ID to "gnu-linux" instead of + "linux". + +As far as I can tell, no code in this repository actually uses the ID +field, so this is just a man page change. +--- + man/os-release.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index f6787f9..79eb402 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -145,7 +145,7 @@ + the operating system, excluding any version information and + suitable for processing by scripts or usage in generated + filenames. If not set, defaults to +- ID=linux. Example: ++ ID=gnu-linux. Example: + ID=fedora or + ID=debian. + +-- +2.8.3 + diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch new file mode 100644 index 000000000..f5e9de8fc --- /dev/null +++ b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch @@ -0,0 +1,33 @@ +From 71b8c10050db1a16402e0600c9921b012c908b44 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:31:20 -0400 +Subject: [PATCH 5/6] FSDG: systemd-resolved: Default to hostname "gnu-linux" + instead of "linux" + +--- + src/resolve/resolved-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c +index 7f90734..e82c6ec 100644 +--- a/src/resolve/resolved-manager.c ++++ b/src/resolve/resolved-manager.c +@@ -429,12 +429,12 @@ static int manager_watch_hostname(Manager *m) { + + r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname); + if (r < 0) { +- log_info("Defaulting to hostname 'linux'."); +- m->llmnr_hostname = strdup("linux"); ++ log_info("Defaulting to hostname 'gnu-linux'."); ++ m->llmnr_hostname = strdup("gnu-linux"); + if (!m->llmnr_hostname) + return log_oom(); + +- m->mdns_hostname = strdup("linux.local"); ++ m->mdns_hostname = strdup("gnu-linux.local"); + if (!m->mdns_hostname) + return log_oom(); + } else +-- +2.8.3 + diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch new file mode 100644 index 000000000..82d60ec94 --- /dev/null +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -0,0 +1,199 @@ +From 566cac15ed36506e2bb766313a5d4e0825bc6499 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:32:21 -0400 +Subject: [PATCH 6/6] FSDG: man/: Use FSDG operating systems as examples. + +--- + man/os-release.xml | 49 +++++++++++++++++++++++++------------------------ + man/systemd-nspawn.xml | 37 +++++++++++++------------------------ + 2 files changed, 38 insertions(+), 48 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 79eb402..a70ba1a 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -122,7 +122,7 @@ + without a version component, and suitable for presentation to + the user. If not set, defaults to + NAME=GNU/Linux. Example: +- NAME=Fedora or NAME="Debian ++ NAME=BLAG or NAME="gNewSense + GNU/Linux". + + +@@ -133,8 +133,8 @@ + version, excluding any OS name information, possibly including + a release code name, and suitable for presentation to the + user. This field is optional. Example: +- VERSION=17 or VERSION="17 (Beefy +- Miracle)". ++ VERSION=210k or VERSION="210k ++ (Spartakus)". + + + +@@ -146,8 +146,8 @@ + suitable for processing by scripts or usage in generated + filenames. If not set, defaults to + ID=gnu-linux. Example: +- ID=fedora or +- ID=debian. ++ ID=blag or ++ ID=gnewsense. + + + +@@ -168,9 +168,9 @@ + should be listed in order of how closely the local operating + system relates to the listed ones, starting with the closest. + This field is optional. Example: for an operating system with +- ID=centos, an assignment of ++ ID=blag, an assignment of + ID_LIKE="rhel fedora" would be appropriate. +- For an operating system with ID=ubuntu, an ++ For an operating system with ID=gnewsense, an + assignment of ID_LIKE=debian is + appropriate. + +@@ -183,8 +183,8 @@ + identifying the operating system version, excluding any OS + name information or release code name, and suitable for + processing by scripts or usage in generated filenames. This +- field is optional. Example: VERSION_ID=17 +- or VERSION_ID=11.04. ++ field is optional. Example: VERSION_ID=210k ++ or VERSION_ID=7.0. + + + +@@ -195,8 +195,8 @@ + a release code name or OS version of some kind, as suitable. + If not set, defaults to + PRETTY_NAME="GNU/Linux". Example: +- PRETTY_NAME="Fedora 17 (Beefy +- Miracle)". ++ PRETTY_NAME="BLAG 210k ++ (Spartakus)". + + + +@@ -219,7 +219,7 @@ + Common + Platform Enumeration Specification as proposed by the + NIST. This field is optional. Example: +- CPE_NAME="cpe:/o:fedoraproject:fedora:17" ++ CPE_NAME="cpe:/o:blagblagblag:blag:210k" + + + +@@ -254,8 +254,8 @@ + one URL shall be listed in each setting. If multiple resources + need to be referenced, it is recommended to provide an online + landing page linking all available resources. Examples: +- HOME_URL="https://fedoraproject.org/" and +- BUG_REPORT_URL="https://bugzilla.redhat.com/" ++ HOME_URL="https://www.blagblagblag.org/" and ++ BUG_REPORT_URL="https://blag.fsf.org/" + + + +@@ -330,21 +330,22 @@ + recommended to prefix new fields with an OS specific + name in order to avoid name clashes. Applications + reading this file must ignore unknown fields. Example: +- DEBIAN_BTS="debbugs://bugs.debian.org/" ++ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" + + + + Example + +- NAME=Fedora +-VERSION="17 (Beefy Miracle)" +-ID=fedora +-VERSION_ID=17 +-PRETTY_NAME="Fedora 17 (Beefy Miracle)" +-ANSI_COLOR="0;34" +-CPE_NAME="cpe:/o:fedoraproject:fedora:17" +-HOME_URL="https://fedoraproject.org/" +-BUG_REPORT_URL="https://bugzilla.redhat.com/" ++ NAME=Parabola ++VERSION="rolling-release" ++ID=parabola ++ID_LIKE=arch ++VERSION_ID=rolling-release ++PRETTY_NAME="Parabola GNU/Linux-libre" ++ANSI_COLOR="1;35" ++CPE_NAME="cpe:/o:parabola:parabola:rolling-release" ++HOME_URL="https://www.parabola.nu/" ++BUG_REPORT_URL="https://labs.parabola.nu/" + + + +diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml +index 86cdb4e..bd7392c 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -912,46 +912,35 @@ + Examples + + +- Download a Fedora image and start a shell in it ++ Build and boot a minimal BLAG distribution in a container + +- # machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz +-# systemd-nspawn -M Fedora-Cloud-Base-20141203-21 +- +- This downloads an image using +- machinectl1 +- and opens a shell in it. +- +- +- +- Build and boot a minimal Fedora distribution in a container +- +- # dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal ++ # dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal + # systemd-nspawn -bD /srv/mycontainer + +- This installs a minimal Fedora distribution into the ++ This installs a minimal BLAG distribution into the + directory /srv/mycontainer/ + and then boots an OS in a namespace container in it. + + + +- Spawn a shell in a container of a minimal Debian unstable distribution ++ Spawn a shell in a container of a minimal gNewSense unstable distribution + +- # debootstrap --arch=amd64 unstable ~/debian-tree/ +-# systemd-nspawn -D ~/debian-tree/ ++ # debootstrap --arch=amd64 unstable ~/gnewsense-tree/ ++# systemd-nspawn -D ~/gnewsense-tree/ + +- This installs a minimal Debian unstable distribution into +- the directory ~/debian-tree/ and then ++ This installs a minimal gNewSense unstable distribution into ++ the directory ~/gnewsense-tree/ and then + spawns a shell in a namespace container in it. + + + +- Boot a minimal Arch Linux distribution in a container ++ Boot a minimal Parabola GNU/Linux-libre distribution in a container + +- # pacstrap -c -d ~/arch-tree/ base +-# systemd-nspawn -bD ~/arch-tree/ ++ # pacstrap -c -d ~/parabola-tree/ base ++# systemd-nspawn -bD ~/parabola-tree/ + +- This installs a minimal Arch Linux distribution into the +- directory ~/arch-tree/ and then boots an OS ++ This installs a minimal Parabola GNU/Linux-libre distribution into the ++ directory ~/parabola-tree/ and then boots an OS + in a namespace container in it. + + +-- +2.8.3 + diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index d474ad448..7a8dcd070 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -21,7 +21,12 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'initcpio-install-udev' 'parabola.conf' 'loader.conf' - 'gnu+linux.patch') + '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' + '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch' + '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch' + '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' + '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch' + '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch') md5sums=('SKIP' 'f8253cd3c0f249591338fbb4c223d249' 'SKIP' @@ -30,7 +35,12 @@ md5sums=('SKIP' '1b3aa3a0551b08af9305d33f85b5c2fc' '36ee74767ac8734dede1cbd0f4f275d7' '9b9f4a58e4c4009bf5290c5b297600c3' - 'd37895215ef74e172c594aebe1ba23cb') + '92a4bb5e527e1e956743c1ffa622adc7' + '35e9e89add0243f77f0b1c9be6f7bdcb' + 'e592f6778c12627d46982ddfe0698361' + 'c4c559f9916806f5162ccff3e7c433e8' + '5166fe700ef5991c2da3876206c699fb' + '166ce41b60d4eaa7738486f7aab5ebd8') validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva prepare() { @@ -48,11 +58,11 @@ prepare() { # revert "core: resolve specifier in config_parse_exec()" git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163 - # Rename "Linux" -> "GNU/Linux" - patch -Np1 -i "$srcdir/gnu+linux.patch" - sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c - sed -i '\|pretty_name| s|Linux|GNU/Linux|' src/analyze/analyze.c src/core/main.c src/firstboot/firstboot.c - sed -i '\|PRETTY_NAME| s|Linux|GNU/Linux|' src/kernel-install/90-loaderentry.install + # apply FSDG patches + local patchfile + for patchfile in "$srcdir"/*.patch; do + patch -Np1 -i "$patchfile" + done # Rename "Linux Boot Manager" -> "Systemd Boot Manager" sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c diff --git a/libre/systemd/gnu+linux.patch b/libre/systemd/gnu+linux.patch deleted file mode 100644 index f6a5e81d5..000000000 --- a/libre/systemd/gnu+linux.patch +++ /dev/null @@ -1,493 +0,0 @@ -diff -Nur a/man/bootup.xml b/man/bootup.xml ---- a/man/bootup.xml 2015-09-11 14:55:47.363340869 -0300 -+++ b/man/bootup.xml 2015-09-11 14:57:22.649010069 -0300 -@@ -54,7 +54,7 @@ - boot. Immediately after power-up, the system BIOS will do minimal - hardware initialization, and hand control over to a boot loader - stored on a persistent storage device. This boot loader will then -- invoke an OS kernel from disk (or the network). In the Linux case, -+ invoke an OS kernel from disk (or the network). In the GNU/Linux case, - this kernel (optionally) extracts and executes an initial RAM disk - image (initrd), such as generated by - dracut8, -diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl ---- a/man/custom-html.xsl 2015-11-28 05:22:36.372154698 -0300 -+++ b/man/custom-html.xsl 2015-11-28 05:23:08.917203964 -0300 -@@ -83,10 +83,10 @@ - - - -- -+ - - -- https://www.archlinux.org/ -+ https://www.parabola.nu/ - - / - -@@ -96,19 +96,6 @@ - - - -- -- -- -- -- -- https://www.freebsd.org/cgi/man.cgi? -- -- ( -- -- ) -- -- -- - - - -diff -Nur a/man/daemon.xml b/man/daemon.xml ---- a/man/daemon.xml 2015-11-28 05:22:36.372154698 -0300 -+++ b/man/daemon.xml 2015-11-28 05:26:43.416694259 -0300 -@@ -74,7 +74,7 @@ - Close all open file descriptors except - standard input, output, and error (i.e. the first three file - descriptors 0, 1, 2). This ensures that no accidentally passed -- file descriptor stays around in the daemon process. On Linux, -+ file descriptor stays around in the daemon process. On GNU/Linux, - this is best implemented by iterating through - /proc/self/fd, with a fallback of - iterating from file descriptor 3 to the value returned by -@@ -168,7 +168,7 @@ - - New-Style Daemons - -- Modern services for Linux should be implemented as -+ Modern services for GNU/Linux should be implemented as - new-style daemons. This makes it easier to supervise and control - them at runtime and simplifies their implementation. - -@@ -311,7 +311,7 @@ - as detailed in the LSB - Linux Standard Base Core Specification. This method of -- activation is supported ubiquitously on Linux init systems, both -+ activation is supported ubiquitously on GNU/Linux init systems, both - old-style and new-style systems. Among other issues, SysV init - scripts have the disadvantage of involving shell scripts in the - boot process. New-style init systems generally employ updated -@@ -479,7 +479,7 @@ - start daemons or .socket units when a - specific IP address is configured on a network interface, - because network sockets shall be bound to the address. However, -- an alternative to implement this is by utilizing the Linux -+ an alternative to implement this is by utilizing the GNU/Linux - IP_FREEBIND socket option, as accessible - via FreeBind=yes in systemd socket files (see - systemd.socket5 -@@ -491,7 +491,7 @@ - for service activation is low system load. However, here too, a - more convincing approach might be to make proper use of features - of the operating system, in particular, the CPU or I/O scheduler -- of Linux. Instead of scheduling jobs from userspace based on -+ of GNU/Linux. Instead of scheduling jobs from userspace based on - monitoring the OS scheduler, it is advisable to leave the - scheduling of processes to the OS scheduler itself. systemd - provides fine-grained access to the CPU and I/O schedulers. If a -diff -Nur a/man/kernel-install.xml b/man/kernel-install.xml ---- a/man/kernel-install.xml 2015-09-11 14:55:47.366340890 -0300 -+++ b/man/kernel-install.xml 2015-09-11 15:04:24.500215627 -0300 -@@ -106,7 +106,7 @@ - PRETTY_NAME parameter specified - in /etc/os-release or - /usr/lib/os-release (if the former is -- missing), or "Linux -+ missing), or "GNU/Linux - KERNEL-VERSION", if unset. If - the file initrd is found next to the - linux file, the initrd will be added to -diff -Nur a/man/os-release.xml b/man/os-release.xml ---- a/man/os-release.xml 2015-09-20 20:12:13.796706013 -0300 -+++ b/man/os-release.xml 2015-09-20 20:14:32.399758269 -0300 -@@ -121,8 +121,8 @@ - A string identifying the operating system, - without a version component, and suitable for presentation to - the user. If not set, defaults to -- NAME=Linux. Example: -- NAME=Fedora or NAME="Debian -+ NAME=GNU/Linux. Example: -+ NAME=BLAG or NAME="gNewSense - GNU/Linux". - - -@@ -133,8 +133,8 @@ - version, excluding any OS name information, possibly including - a release code name, and suitable for presentation to the - user. This field is optional. Example: -- VERSION=17 or VERSION="17 (Beefy -- Miracle)". -+ VERSION=210k or VERSION="210k" -+ . - - - -@@ -145,9 +145,9 @@ - the operating system, excluding any version information and - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to -- ID=linux. Example: -- ID=fedora or -- ID=debian. -+ ID=gnu-plus-linux. Example: -+ ID=blag or -+ ID=gnewsense. - - - -@@ -168,9 +168,9 @@ - should be listed in order of how closely the local operating - system relates to the listed ones, starting with the closest. - This field is optional. Example: for an operating system with -- ID=centos, an assignment of -+ ID=blag, an assignment of - ID_LIKE="rhel fedora" would be appropriate. -- For an operating system with ID=ubuntu, an -+ For an operating system with ID=gnewsense, an - assignment of ID_LIKE=debian is - appropriate. - -@@ -183,8 +183,8 @@ - identifying the operating system version, excluding any OS - name information or release code name, and suitable for - processing by scripts or usage in generated filenames. This -- field is optional. Example: VERSION_ID=17 -- or VERSION_ID=11.04. -+ field is optional. Example: VERSION_ID=210k -+ or VERSION_ID=7.0. - - - -@@ -194,9 +194,8 @@ - suitable for presentation to the user. May or may not contain - a release code name or OS version of some kind, as suitable. - If not set, defaults to -- PRETTY_NAME="Linux". Example: -- PRETTY_NAME="Fedora 17 (Beefy -- Miracle)". -+ PRETTY_NAME="GNU/Linux". Example: -+ PRETTY_NAME="BLAG 210k". - - - -@@ -219,7 +218,7 @@ - Common - Platform Enumeration Specification as proposed by the - NIST. This field is optional. Example: -- CPE_NAME="cpe:/o:fedoraproject:fedora:17" -+ CPE_NAME="cpe:/o:blagblagblag:blag:210k" - - - -@@ -254,8 +253,8 @@ - one URL shall be listed in each setting. If multiple resources - need to be referenced, it is recommended to provide an online - landing page linking all available resources. Examples: -- HOME_URL="https://fedoraproject.org/" and -- BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ HOME_URL="https://www.blagblagblag.org/" and -+ BUG_REPORT_URL="https://blag.fsf.org/" - - - -@@ -330,21 +329,22 @@ - recommended to prefix new fields with an OS specific - name in order to avoid name clashes. Applications - reading this file must ignore unknown fields. Example: -- DEBIAN_BTS="debbugs://bugs.debian.org/" -+ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" - - - - Example - -- NAME=Fedora --VERSION="17 (Beefy Miracle)" --ID=fedora --VERSION_ID=17 --PRETTY_NAME="Fedora 17 (Beefy Miracle)" --ANSI_COLOR="0;34" --CPE_NAME="cpe:/o:fedoraproject:fedora:17" --HOME_URL="https://fedoraproject.org/" --BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ NAME=Parabola -+VERSION="rolling-release" -+ID=parabola -+ID_LIKE=arch -+VERSION_ID=rolling-release -+PRETTY_NAME="Parabola GNU/Linux-libre" -+ANSI_COLOR="1;35" -+CPE_NAME="cpe:/o:parabola:parabola:rolling-release" -+HOME_URL="https://www.parabola.nu/" -+BUG_REPORT_URL="https://labs.parabola.nu/" - - - -diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml ---- a/man/sd-bus-errors.xml 2015-11-28 05:22:36.375487866 -0300 -+++ b/man/sd-bus-errors.xml 2015-11-28 05:23:08.920537132 -0300 -@@ -126,7 +126,7 @@ - - In addition to this list, in sd-bus, the special error - namespace System.Error. is used to map -- arbitrary Linux system errors (as defined by errno3) - to D-Bus errors and back. For example, the error - EUCLEAN is mapped to -diff -Nur a/man/sd-login.xml b/man/sd-login.xml ---- a/man/sd-login.xml 2015-09-11 14:55:47.368340904 -0300 -+++ b/man/sd-login.xml 2015-09-11 15:33:41.770605951 -0300 -@@ -68,8 +68,8 @@ - - See Multi-Seat -- on Linux for an introduction into multi-seat support on -- Linux, the background for this set of APIs. -+ on GNU/Linux for an introduction into multi-seat support on -+ GNU/Linux, the background for this set of APIs. - - Note that these APIs only allow purely passive access and - monitoring of seats, sessions and users. To actively make changes -diff -Nur a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml ---- a/man/sd_bus_error_add_map.xml 2015-09-11 14:55:47.369340911 -0300 -+++ b/man/sd_bus_error_add_map.xml 2015-09-11 15:31:21.081524317 -0300 -@@ -82,7 +82,7 @@ - - The sd_bus_error_add_map() call may be - used to register additional mappings for converting D-Bus errors -- to Linux errno-style errors. The mappings -+ to GNU/Linux errno-style errors. The mappings - defined with this call are consulted by calls such as - sd_bus_error_set3 - or -diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml ---- a/man/sd_is_fifo.xml 2015-09-11 14:55:47.372340932 -0300 -+++ b/man/sd_is_fifo.xml 2015-09-11 15:32:47.346188708 -0300 -@@ -145,7 +145,7 @@ - the path parameter is - NULL. For normal file system - AF_UNIX sockets, set the -- length parameter to 0. For Linux abstract -+ length parameter to 0. For GNU/Linux abstract - namespace sockets, set the length to the - size of the address, including the initial 0 byte, and set the - path to the initial 0 byte of the socket -diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml ---- a/man/sd_notify.xml 2015-10-17 07:04:47.746947733 -0300 -+++ b/man/sd_notify.xml 2015-10-17 07:05:10.849133263 -0300 -@@ -316,7 +316,7 @@ - referenced in the $NOTIFY_SOCKET environment - variable. If the first character of - $NOTIFY_SOCKET is @, the -- string is understood as Linux abstract namespace socket. The -+ string is understood as GNU/Linux abstract namespace socket. The - datagram is accompanied by the process credentials of the sending - service, using SCM_CREDENTIALS. - -diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml ---- a/man/systemd-detect-virt.xml 2015-11-28 05:22:36.382154201 -0300 -+++ b/man/systemd-detect-virt.xml 2015-11-28 05:29:15.395921466 -0300 -@@ -104,16 +104,6 @@ - - - -- vmware -- VMware Workstation or Server, and related products -- -- -- -- microsoft -- Hyper-V, also known as Viridian or Windows Server Virtualization -- -- -- - oracle - Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems) - -@@ -146,12 +136,12 @@ - - - lxc -- Linux container implementation by LXC -+ GNU/Linux container implementation by LXC - - - - lxc-libvirt -- Linux container implementation by libvirt -+ GNU/Linux container implementation by libvirt - - - -diff -Nur a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml ---- a/man/systemd-logind.service.xml 2015-09-11 14:55:47.378340974 -0300 -+++ b/man/systemd-logind.service.xml 2015-09-11 15:45:37.799989107 -0300 -@@ -94,7 +94,7 @@ - - See Multi-Seat -- on Linux for an introduction into basic concepts of logind -+ on GNU/Linux for an introduction into basic concepts of logind - such as users, sessions and seats. - - See the - -- Similarly, if run inside a Linux container -+ Similarly, if run inside a GNU/Linux container - environment and a UUID is configured for the container, this is - used to initialize the machine ID. For details, see the - documentation of the In contrast to - chroot1 systemd-nspawn -- may be used to boot full Linux-based operating systems in a -+ may be used to boot full GNU/Linux-based operating systems in a - container. - - Use a tool like - dnf8, - debootstrap8, - or -- pacman8 -+ pacman8 - to set up an OS directory tree suitable as file system hierarchy - for systemd-nspawn containers. - -@@ -852,46 +852,35 @@ - Examples - - -- Download a Fedora image and start a shell in it -+ Build and boot a minimal BLAG distribution in a container - -- # machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz --# systemd-nspawn -M Fedora-Cloud-Base-20141203-21 -- -- This downloads an image using -- machinectl1 -- and opens a shell in it. -- -- -- -- Build and boot a minimal Fedora distribution in a container -- -- # dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal -+ # dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal - # systemd-nspawn -bD /srv/mycontainer - -- This installs a minimal Fedora distribution into the -+ This installs a minimal BLAG distribution into the - directory /srv/mycontainer/ - and then boots an OS in a namespace container in it. - - - -- Spawn a shell in a container of a minimal Debian unstable distribution -+ Spawn a shell in a container of a minimal gNewSense unstable distribution - -- # debootstrap --arch=amd64 unstable ~/debian-tree/ --# systemd-nspawn -D ~/debian-tree/ -+ # debootstrap --arch=amd64 unstable ~/gnewsense-tree/ -+# systemd-nspawn -D ~/gnewsense-tree/ - -- This installs a minimal Debian unstable distribution into -- the directory ~/debian-tree/ and then -+ This installs a minimal gNewSense unstable distribution into -+ the directory ~/gnewsense-tree/ and then - spawns a shell in a namespace container in it. - - - -- Boot a minimal Arch Linux distribution in a container -+ Boot a minimal Parabola GNU/Linux-libre distribution in a container - -- # pacstrap -c -d ~/arch-tree/ base --# systemd-nspawn -bD ~/arch-tree/ -+ # pacstrap -c -d ~/parabola-tree/ base -+# systemd-nspawn -bD ~/parabola-tree/ - -- This installs a minimal Arch Linux distribution into the -- directory ~/arch-tree/ and then boots an OS -+ This installs a minimal Parabola GNU/Linux-libre distribution into the -+ directory ~/parabola-tree/ and then boots an OS - in a namespace container in it. - - -@@ -929,7 +918,7 @@ - chroot1, - dnf8, - debootstrap8, -- pacman8, -+ pacman8, - systemd.slice5, - machinectl1, - btrfs8 -diff -Nur a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml ---- a/man/systemd-sleep.conf.xml 2015-09-11 14:55:47.380340988 -0300 -+++ b/man/systemd-sleep.conf.xml 2015-09-11 16:08:59.858313702 -0300 -@@ -165,7 +165,7 @@ - Example: freeze - - Example: to exploit the freeze mode added -- in Linux 3.9, one can use systemctl suspend -+ in Linux 3.9 kernel, one can use systemctl suspend - with - [Sleep] - SuspendState=freeze -diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml ---- a/man/systemd.socket.xml 2015-11-28 05:22:36.392153706 -0300 -+++ b/man/systemd.socket.xml 2015-11-28 05:23:08.920537132 -0300 -@@ -289,7 +289,7 @@ - Specifies a POSIX message queue name to listen - on. This expects a valid message queue name (i.e. beginning - with /). Behavior otherwise is very similar to the -- ListenFIFO= directive above. On Linux -+ ListenFIFO= directive above. On GNU/Linux - message queue descriptors are actually file descriptors and - can be inherited between processes. - -diff -Nur a/man/systemd.xml b/man/systemd.xml ---- a/man/systemd.xml 2015-11-28 05:22:36.392153706 -0300 -+++ b/man/systemd.xml 2015-11-28 05:23:08.923870299 -0300 -@@ -61,7 +61,7 @@ - - Description - -- systemd is a system and service manager for Linux operating -+ systemd is a system and service manager for GNU/Linux operating - systems. When run as first process on boot (as PID 1), it acts as - init system that brings up and maintains userspace - services. -@@ -852,10 +852,10 @@ - Kernel Command Line - - When run as system instance systemd parses a number of -- kernel command line argumentsIf run inside a Linux -+ kernel command line argumentsIf run inside a GNU/Linux - container these arguments may be passed as command line arguments - to systemd itself, next to any of the command line options listed -- in the Options section above. If run outside of Linux containers, -+ in the Options section above. If run outside of GNU/Linux containers, - these arguments are parsed from /proc/cmdline - instead.: - -- cgit v1.2.3 From fc136c3ce8b9cb4ba6dacf014cccc3a3625a7ba2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 13:07:02 -0400 Subject: libre/systemd: Tidy, also package libsystemd, systemd-sysvcompat. --- libre/systemd/PKGBUILD | 62 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 7a8dcd070..7ce39780f 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -1,21 +1,22 @@ # Maintainer (Arch): Dave Reisner # Maintainer (Arch): Tom Gundersen # Maintainer: André Silva +# Contributor: Luke Shumaker pkgbase=systemd -pkgname=systemd +pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') pkgver=229 pkgrel=3.parabola1 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' - 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers' + 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'python-lxml' 'quota-tools' 'shadow' 'git') -[ "$CARCH" != "armv7h" ] && makedepends+=('gnu-efi-libs') +makedepends_i686=('gnu-efi-libs') +makedepends_x86_64=('gnu-efi-libs') options=('strip' 'debug') source=("git://github.com/systemd/systemd.git#tag=v$pkgver" - "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig} 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' @@ -26,10 +27,9 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch' '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch' - '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch') + '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' + "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig}) md5sums=('SKIP' - 'f8253cd3c0f249591338fbb4c223d249' - 'SKIP' '90ea67a7bb237502094914622a39e281' '976c5511b6493715e381f43f16cdb151' '1b3aa3a0551b08af9305d33f85b5c2fc' @@ -40,7 +40,9 @@ md5sums=('SKIP' 'e592f6778c12627d46982ddfe0698361' 'c4c559f9916806f5162ccff3e7c433e8' '5166fe700ef5991c2da3876206c699fb' - '166ce41b60d4eaa7738486f7aab5ebd8') + '166ce41b60d4eaa7738486f7aab5ebd8' + 'f8253cd3c0f249591338fbb4c223d249' + 'SKIP') validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva prepare() { @@ -79,8 +81,11 @@ build() { LDFLAGS+=" -Wl,-fuse-ld=bfd" CFLAGS+=" -fno-lto" CXXFLAGS+=" -fno-lto" - else - extra=--enable-gnuefi + fi + + local enable_gnuefi='' + if [ "$CARCH" != "armv7h" ]; then + enable_gnuefi='--enable-gnuefi' fi ./configure \ @@ -88,21 +93,21 @@ build() { --localstatedir=/var \ --sysconfdir=/etc \ --enable-lz4 \ + $enable_gnuefi \ --disable-audit \ --disable-ima \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ - --with-ntp-servers="${timeservers[*]}" \ - $extra + --with-ntp-servers="${timeservers[*]}" make } package_systemd() { - pkgdesc="system and service manager (Parabola rebranded)" + pkgdesc="system and service manager" license=('GPL2' 'LGPL2.1') depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' - 'libgcrypt' "libsystemd=$pkgver" 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' + 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev') @@ -184,4 +189,33 @@ package_systemd() { install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp } +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') + license=('GPL2') + provides=('libsystemd.so' 'libudev.so') + + make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + license=('GPL2') + groups=('base') + conflicts=('sysvinit') + depends=('systemd') + + install -dm755 "$pkgdir"/usr/share/man/man8 + cp -d --no-preserve=ownership,timestamp \ + "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$pkgdir"/usr/share/man/man8 + + install -dm755 "$pkgdir/usr/bin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s 'systemctl' "$pkgdir/usr/bin/$tool" + done + + ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init" +} + # vim: ft=sh syn=sh et -- cgit v1.2.3 From 90eb3e2ada0d1e00d99ae15961dc6e639839bf6d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 17:43:11 -0400 Subject: libre/systemd: further split the package Also, put library-related files (man pages, includes, pkgconfig entries) in the package with the library. Splitting out the libraries should help with the openrc efforts. Or at least avoid the awkward repackaging of libsystemd that is currently happening. --- libre/systemd/PKGBUILD | 99 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 7ce39780f..11067955f 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -4,7 +4,8 @@ # Contributor: Luke Shumaker pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') +pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat' + 'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgver=229 pkgrel=3.parabola1 arch=('i686' 'x86_64' 'armv7h') @@ -101,6 +102,38 @@ build() { --with-ntp-servers="${timeservers[*]}" make + + # Go ahead and split the package now. It's easier this way, because + # we can use mv instead of awkward, error-prone rm/cp pairs. + rm -rf "$srcdir/dest" + + # Put things in the main systemd package by default + make DESTDIR="$srcdir/dest/systemd" install + + install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include} + mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd + mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc + mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/ + mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/ + + install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include} + mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h + mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc + mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/ + mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/ + + local nssmodule + for nssmodule in myhostname mymachines resolve; do + install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} + mv -T "$srcdir/dest"/{systemd,nss-$nssmodule}/usr/share/man/man8/nss-$nssmodule.8 + mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/ + done + + install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 + mv "$srcdir/dest/systemd"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 + + rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include} } package_systemd() { @@ -109,9 +142,9 @@ package_systemd() { depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') - provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") - replaces=('nss-myhostname' 'systemd-tools' 'udev') - conflicts=('nss-myhostname' 'systemd-tools' 'udev') + provides=("systemd-tools=$pkgver" "udev=$pkgver") + replaces=('systemd-tools' 'udev') + conflicts=('systemd-tools' 'udev') optdepends=('cryptsetup: required for encrypted block devices' 'libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' @@ -139,7 +172,7 @@ package_systemd() { etc/udev/udev.conf) install="systemd.install" - make -C "$pkgbase" DESTDIR="$pkgdir" install + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" # don't write units to /etc by default. some of these will be re-enabled on # post_install. @@ -177,12 +210,6 @@ package_systemd() { # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - ### manpages shipped with systemd-sysvcompat - rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - - ### runtime libraries shipped with libsystemd - rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* - # add example bootctl configuration install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf @@ -190,12 +217,51 @@ package_systemd() { } package_libsystemd() { - pkgdesc="systemd client libraries" + pkgdesc="systemd client libraries metapackage" + depends=(libsystemd-standalone libudev nss-myhostname nss-mymachines nss-resolve) + license=('GPL2') +} + +package_libsystemd-standalone() { + pkgdesc="systemd client library" depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') license=('GPL2') - provides=('libsystemd.so' 'libudev.so') + provides=('libsystemd.so') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/libsystemd" "$pkgdir" +} + +package_libudev() { + pkgdesc="systemd library for enumerating and introspecting local devices" + depends=('glibc' 'libcap') + license=('GPL2') + provides=('libudev.so') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" +} + +package_nss-myhostname() { + pkgdesc="NSS module providing hostname resolution for the locally configured system hostname" + depends=('glibc' 'libcap') + license=('GPL2') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" +} + +package_nss-mymachines() { + pkgdesc="NSS module providing hostname resolution for local systemd-machined container instances" + depends=('glibc' 'libcap') + license=('GPL2') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" +} + +package_nss-resolve() { + pkgdesc="NSS module providing hostname resolution via systemd-resolved" + depends=('glibc' 'libcap') + license=('GPL2') - make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-sysvcompat() { @@ -205,10 +271,7 @@ package_systemd-sysvcompat() { conflicts=('sysvinit') depends=('systemd') - install -dm755 "$pkgdir"/usr/share/man/man8 - cp -d --no-preserve=ownership,timestamp \ - "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$pkgdir"/usr/share/man/man8 + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" install -dm755 "$pkgdir/usr/bin" for tool in runlevel reboot shutdown poweroff halt telinit; do -- cgit v1.2.3 From c5f19e40cab40fef572f1d4c018f12c5e0aba5c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 17:43:26 -0400 Subject: libre/systemd: bump pkgrel --- libre/systemd/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 11067955f..48b23cfde 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat' 'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgver=229 -pkgrel=3.parabola1 +pkgrel=3.parabola2 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' -- cgit v1.2.3 From 217f3b2956fe4c73dadd3b118a5b13ca6aa619bd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 17:45:21 -0400 Subject: .gitignore: I guess recent git dropped the the {,} notation. --- .gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 243450fea..121e16f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,10 @@ **/.git **/.hg .* -pkg{,-libre}/ -src{,-libre}/ +pkg/ +src/ +pkg-libre/ +src-libre/ librefetch.* *loongson*.patch* grsecurity*.patch* -- cgit v1.2.3 From 3e5b611463106cc4c50db5cb4fcc4c71e1923d90 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 25 May 2016 18:48:25 -0300 Subject: wings3d-1.5.4-2.parabola1: hooks rebuild --- libre/wings3d/PKGBUILD | 18 +++++++++++------- libre/wings3d/wings3d.install | 13 ------------- 2 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 libre/wings3d/wings3d.install diff --git a/libre/wings3d/PKGBUILD b/libre/wings3d/PKGBUILD index 764246778..7bff97243 100644 --- a/libre/wings3d/PKGBUILD +++ b/libre/wings3d/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 122569 2014-11-14 13:43:53Z arodseth $ -# Maintainer (Arch): Alexander Rødseth +# $Id: PKGBUILD 176459 2016-05-24 21:23:19Z arodseth $ +# Maintainer (Arch): Alexander F Rødseth # Contributor (Arch): kappa # Maintainer: Márcio Silva pkgname=wings3d _pkgname=wings pkgver=1.5.4 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc='3D modeling program, without nonfree kerkythea render support' arch=('x86_64' 'i686') url='http://www.wings3d.com/' @@ -16,19 +16,21 @@ makedepends=('gendesk' 'imagemagick') optdepends=('povray: rendering support via POV-Ray') conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") -install=$pkgname.install source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2" "$pkgname.sh") sha256sums=('bd04ca1c1237f3a6f29ce3f653015e21142b849b338a3d1ab8633e3c6bcde663' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e') prepare() { - gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \ + gendesk -f -n \ + --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \ --genericname '3D Modeler' --categories 'Graphics;3DGraphics' + convert "$_pkgname-$pkgver/win32/wings.ico" "$pkgname.png" # Path fix for building wpc_lwo - ln -s "$srcdir/$_pkgname-$pkgver" "$_pkgname-$pkgver/plugins_src/import_export/wings" + ln -s "$srcdir/$_pkgname-$pkgver" \ + "$_pkgname-$pkgver/plugins_src/import_export/wings" } build() { @@ -41,8 +43,9 @@ package() { install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - cd "$_pkgname-$pkgver" install -d "$pkgdir/usr/lib/$pkgname" + + cd "$_pkgname-$pkgver" for subdir in ebin fonts patches plugins shaders textures; do cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname" done @@ -53,4 +56,5 @@ package() { rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang} } +# getver: wings3d.com/?page_id=84 # vim:set ts=2 sw=2 et: diff --git a/libre/wings3d/wings3d.install b/libre/wings3d/wings3d.install deleted file mode 100644 index ad97d7bab..000000000 --- a/libre/wings3d/wings3d.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 043463f681b76cb0b0d1b5dd424d27cc3dcea445 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 25 May 2016 20:14:10 -0300 Subject: liferea-1.10.19-1.parabola1: updating version --- libre/liferea/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/liferea/PKGBUILD b/libre/liferea/PKGBUILD index af3c5b1cb..ced5eeb28 100644 --- a/libre/liferea/PKGBUILD +++ b/libre/liferea/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 267031 2016-05-06 18:29:30Z arojas $ +# $Id: PKGBUILD 268568 2016-05-25 20:34:14Z arojas $ # Maintainer (Arch): Eric Bélanger # Maintainer: André Silva # Contributor: bitlord pkgname=liferea -pkgver=1.10.18 +pkgver=1.10.19 pkgrel=1.parabola1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -23,13 +23,13 @@ optdepends=('gnome-keyring: for keyring plugin support' options=('!emptydirs') source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('de09d150a5a5844d9cfe0b82c120b29388b108d3' +sha1sums=('5afed65c2a91464ade8007d14e0c9d2fe54c90f6' 'e787f9209415ed2574e54b020cf449268ece3583') build() { cd liferea-${pkgver} # remove nonfree suggestions - patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" + patch -p1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } -- cgit v1.2.3