summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre-testing/filesystem/PKGBUILD112
-rw-r--r--libre-testing/filesystem/crypttab17
-rw-r--r--libre-testing/filesystem/filesystem.install60
-rw-r--r--libre-testing/filesystem/fstab5
-rw-r--r--libre-testing/filesystem/group32
-rw-r--r--libre-testing/filesystem/gshadow32
-rw-r--r--libre-testing/filesystem/host.conf8
-rw-r--r--libre-testing/filesystem/hosts9
-rw-r--r--libre-testing/filesystem/issue2
-rw-r--r--libre-testing/filesystem/ld.so.conf7
-rw-r--r--libre-testing/filesystem/modprobe.d.usb-load-ehci-first2
-rw-r--r--libre-testing/filesystem/motd0
-rw-r--r--libre-testing/filesystem/nsswitch.conf19
-rw-r--r--libre-testing/filesystem/os-release8
-rw-r--r--libre-testing/filesystem/passwd7
-rw-r--r--libre-testing/filesystem/profile27
-rw-r--r--libre-testing/filesystem/resolv.conf8
-rw-r--r--libre-testing/filesystem/securetty15
-rw-r--r--libre-testing/filesystem/shadow7
-rw-r--r--libre-testing/filesystem/shells8
-rw-r--r--libre/filesystem/PKGBUILD24
-rw-r--r--libre/filesystem/locale.sh (renamed from libre-testing/filesystem/locale.sh)0
-rw-r--r--libre/filesystem/parabola.7.txt (renamed from libre-testing/filesystem/parabola.7.txt)0
23 files changed, 19 insertions, 390 deletions
diff --git a/libre-testing/filesystem/PKGBUILD b/libre-testing/filesystem/PKGBUILD
deleted file mode 100644
index 49e837e02..000000000
--- a/libre-testing/filesystem/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-
-pkgname=filesystem
-pkgver=2012.8
-pkgrel=1.2
-pkgdesc='Base filesystem for Parabola'
-arch=('any')
-license=('GPL')
-url='https://parabolagnulinux.org'
-groups=('base')
-install='filesystem.install'
-makedepends=('asciidoc')
-depends=('iana-etc' 'bash' 'coreutils')
-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')
-
-build() {
- cd ${srcdir}
- a2x -d manpage -f manpage parabola.7.txt
-}
-
-package() {
- cd ${pkgdir}
-
- #
- # setup root filesystem
- #
- for d in boot dev etc home media 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 os-release 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/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
-
- # 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 sbin 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
-
- #
- # 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
-}
-md5sums=('45940618da782cc391c59f88ab3333c3'
- '6be47d893fd49b2e4a8c0e811b350861'
- '13753e4e0964f3652b0cc60a28528bdf'
- '4c4540eeb748bf1f71d631b8c1dcf0b3'
- 'f28150d4c0b22a017be51b9f7f9977ed'
- '6e488ffecc8ba142c0cf7e2d7aeb832e'
- '8a9042a2cedf6b6b47eb8973f14289cb'
- 'b8355d9d2782f424f4cedcf682651be0'
- 'ca716f853860199c1286e7939b2f2666'
- '1745349eb24ed21b4cfaa6f423bddb76'
- '7bc65f234dfb6abf24e7c3b03e86f4ff'
- 'd41d8cd98f00b204e9800998ecf8427e'
- '0e145e18fea8fd190b30d45764f5707c'
- '6f48288b6fcaf0065fcb7b0e525413e0'
- '22518e922891f9359f971f4f5b4e793c'
- 'f95416882cef800edef08382a1176b7d'
- 'f3b6ae7db8adffaaa4bffc6099dcbd50'
- 'a8a962370cd0128465d514e6a1f74130'
- '3674fcb22044d2946934e7826aa0c632'
- '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre-testing/filesystem/crypttab b/libre-testing/filesystem/crypttab
deleted file mode 100644
index 195945a74..000000000
--- a/libre-testing/filesystem/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/<name> 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).
-
-# <name> <device> <password> <options>
-# 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-testing/filesystem/filesystem.install b/libre-testing/filesystem/filesystem.install
deleted file mode 100644
index c8717f01b..000000000
--- a/libre-testing/filesystem/filesystem.install
+++ /dev/null
@@ -1,60 +0,0 @@
-post_install() {
- [ -f var/log/lastlog ] || : >var/log/lastlog
- [ -f var/log/wtmp ] || : >var/log/wtmp
- [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; }
- # workaround for bug #7194
- # readded due to bug #9465
- # please do not remove!
- chmod 1777 var/spool/mail tmp var/tmp
-}
-
-# args: <group> [options]
-_addgroup() {
- if ! getent group "$1" >/dev/null; then
- groupadd "$@" >/dev/null
- fi
-}
-
-# args: <group> [options]
-_adduser() {
- if ! getent passwd "$1" >/dev/null; then
- useradd "$@" >/dev/null
- fi
-}
-
-post_upgrade() {
- post_install
-
- _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 /bin/false
- _addgroup scanner -g 96
- _addgroup rfkill -g 24
- _addgroup lock -g 54
-
- # sync gshadow to group (fixes FS#19869
- if ! grep -q '^lock:' etc/gshadow; then
- grpconv >/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-testing/filesystem/fstab b/libre-testing/filesystem/fstab
deleted file mode 100644
index f7f9298d4..000000000
--- a/libre-testing/filesystem/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/fstab: static file system information
-#
-# <file system> <dir> <type> <options> <dump> <pass>
-tmpfs /tmp tmpfs nodev,nosuid 0 0
diff --git a/libre-testing/filesystem/group b/libre-testing/filesystem/group
deleted file mode 100644
index 6e8e773d8..000000000
--- a/libre-testing/filesystem/group
+++ /dev/null
@@ -1,32 +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:
-network:x:90:
-video:x:91:
-audio:x:92:
-optical:x:93:
-floppy:x:94:
-storage:x:95:
-scanner:x:96:
-power:x:98:
-nobody:x:99:
-users:x:100:
diff --git a/libre-testing/filesystem/gshadow b/libre-testing/filesystem/gshadow
deleted file mode 100644
index c5c76354e..000000000
--- a/libre-testing/filesystem/gshadow
+++ /dev/null
@@ -1,32 +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:::
-network:x::
-video:x::
-audio:::
-optical:::
-floppy:x::
-storage:x::
-scanner:x::
-power:x::
-nobody:::
-users:::
diff --git a/libre-testing/filesystem/host.conf b/libre-testing/filesystem/host.conf
deleted file mode 100644
index cf52fe561..000000000
--- a/libre-testing/filesystem/host.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/host.conf
-#
-
-order hosts,bind
-multi on
-
-# End of file
diff --git a/libre-testing/filesystem/hosts b/libre-testing/filesystem/hosts
deleted file mode 100644
index 1747f9196..000000000
--- a/libre-testing/filesystem/hosts
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# /etc/hosts: static lookup table for host names
-#
-
-#<ip-address> <hostname.domain.org> <hostname>
-127.0.0.1 localhost.localdomain localhost
-::1 localhost.localdomain localhost
-
-# End of file
diff --git a/libre-testing/filesystem/issue b/libre-testing/filesystem/issue
deleted file mode 100644
index b001c55dd..000000000
--- a/libre-testing/filesystem/issue
+++ /dev/null
@@ -1,2 +0,0 @@
-Parabola GNU/Linux-libre \r (\n) (\l)
-
diff --git a/libre-testing/filesystem/ld.so.conf b/libre-testing/filesystem/ld.so.conf
deleted file mode 100644
index dfac45683..000000000
--- a/libre-testing/filesystem/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-testing/filesystem/modprobe.d.usb-load-ehci-first b/libre-testing/filesystem/modprobe.d.usb-load-ehci-first
deleted file mode 100644
index 947379411..000000000
--- a/libre-testing/filesystem/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-testing/filesystem/motd b/libre-testing/filesystem/motd
deleted file mode 100644
index e69de29bb..000000000
--- a/libre-testing/filesystem/motd
+++ /dev/null
diff --git a/libre-testing/filesystem/nsswitch.conf b/libre-testing/filesystem/nsswitch.conf
deleted file mode 100644
index 6e459adb6..000000000
--- a/libre-testing/filesystem/nsswitch.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-publickey: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-netgroup: files
-
-# End /etc/nsswitch.conf
diff --git a/libre-testing/filesystem/os-release b/libre-testing/filesystem/os-release
deleted file mode 100644
index fe5f20b4f..000000000
--- a/libre-testing/filesystem/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-testing/filesystem/passwd b/libre-testing/filesystem/passwd
deleted file mode 100644
index a4a24e34f..000000000
--- a/libre-testing/filesystem/passwd
+++ /dev/null
@@ -1,7 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/false
-daemon:x:2:2:daemon:/sbin:/bin/false
-mail:x:8:12:mail:/var/spool/mail:/bin/false
-ftp:x:14:11:ftp:/srv/ftp:/bin/false
-http:x:33:33:http:/srv/http:/bin/false
-nobody:x:99:99:nobody:/:/bin/false
diff --git a/libre-testing/filesystem/profile b/libre-testing/filesystem/profile
deleted file mode 100644
index 3bc22db9f..000000000
--- a/libre-testing/filesystem/profile
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
-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-testing/filesystem/resolv.conf b/libre-testing/filesystem/resolv.conf
deleted file mode 100644
index cecafba03..000000000
--- a/libre-testing/filesystem/resolv.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/resolv.conf
-#
-
-#search <yourdomain.tld>
-#nameserver <ip>
-
-# End of file
diff --git a/libre-testing/filesystem/securetty b/libre-testing/filesystem/securetty
deleted file mode 100644
index 5a2235ce7..000000000
--- a/libre-testing/filesystem/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-testing/filesystem/shadow b/libre-testing/filesystem/shadow
deleted file mode 100644
index ccab68d33..000000000
--- a/libre-testing/filesystem/shadow
+++ /dev/null
@@ -1,7 +0,0 @@
-root::14871::::::
-bin:x:14871::::::
-daemon:x:14871::::::
-mail:x:14871::::::
-ftp:x:14871::::::
-http:x:14871::::::
-nobody:x:14871::::::
diff --git a/libre-testing/filesystem/shells b/libre-testing/filesystem/shells
deleted file mode 100644
index 18c1aeffa..000000000
--- a/libre-testing/filesystem/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
index add2fa659..49e837e02 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,24 +1,31 @@
-# $Id: PKGBUILD 163827 2012-07-20 23:47:38Z tomegun $
+# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=filesystem
-pkgver=2012.7
-pkgrel=1
+pkgver=2012.8
+pkgrel=1.2
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
url='https://parabolagnulinux.org'
groups=('base')
install='filesystem.install'
+makedepends=('asciidoc')
depends=('iana-etc' 'bash' 'coreutils')
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')
+ 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
+ 'locale.sh')
+
+build() {
+ cd ${srcdir}
+ a2x -d manpage -f manpage parabola.7.txt
+}
package() {
cd ${pkgdir}
@@ -47,6 +54,7 @@ package() {
done
touch 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
# setup /var
for d in cache/man local opt log/old lib/misc empty; do
@@ -69,6 +77,10 @@ package() {
install -d -m755 usr/share/man/man${d}
done
+ #
+ # install parabola(7) manpage
+ #
+ install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
#
# setup /usr/local hierarchy
@@ -95,4 +107,6 @@ md5sums=('45940618da782cc391c59f88ab3333c3'
'22518e922891f9359f971f4f5b4e793c'
'f95416882cef800edef08382a1176b7d'
'f3b6ae7db8adffaaa4bffc6099dcbd50'
- 'a8a962370cd0128465d514e6a1f74130')
+ 'a8a962370cd0128465d514e6a1f74130'
+ '3674fcb22044d2946934e7826aa0c632'
+ '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre-testing/filesystem/locale.sh b/libre/filesystem/locale.sh
index 5fd4174d5..5fd4174d5 100644
--- a/libre-testing/filesystem/locale.sh
+++ b/libre/filesystem/locale.sh
diff --git a/libre-testing/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
index f7da03147..f7da03147 100644
--- a/libre-testing/filesystem/parabola.7.txt
+++ b/libre/filesystem/parabola.7.txt