diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/pmount/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/pmount/files')
3 files changed, 159 insertions, 0 deletions
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch new file mode 100644 index 000000000000..93d0555f0f3d --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch @@ -0,0 +1,43 @@ +From d3f14cfd82cae939d9c487e9cb1a2973dc9b9a4f Mon Sep 17 00:00:00 2001 +From: Romain Perier <mrpouet@gentoo.org> +Date: Wed, 23 Sep 2009 19:37:55 +0200 +Subject: [PATCH] Fix testsuite due to missing sub-directory (see gitweb on upstream) + +--- + tests/check_fstab/a | 1 + + tests/check_fstab/d | 1 + + tests/check_fstab/fstab | 6 ++++++ + 3 files changed, 8 insertions(+), 0 deletions(-) + create mode 100644 tests/check_fstab/a + create mode 100644 tests/check_fstab/d + create mode 100644 tests/check_fstab/fstab + +diff --git a/tests/check_fstab/a b/tests/check_fstab/a +new file mode 100644 +index 0000000..d16d1c5 +--- /dev/null ++++ tests/check_fstab/a +@@ -0,0 +1 @@ ++This file is a 'dummy device file' for the fstab check +diff --git a/tests/check_fstab/d b/tests/check_fstab/d +new file mode 100644 +index 0000000..d16d1c5 +--- /dev/null ++++ tests/check_fstab/d +@@ -0,0 +1 @@ ++This file is a 'dummy device file' for the fstab check +diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab +new file mode 100644 +index 0000000..8ba6f6c +--- /dev/null ++++ tests/check_fstab/fstab +@@ -0,0 +1,6 @@ ++# A dummy fstab file for ++ ++# <file system> <mount point> <type> <options> <dump> <pass> ++check_fstab/a /test1 ext3 defaults 0 0 ++check_fstab/e /test2 ext3 defaults 0 0 ++ +-- +1.6.5.rc1 + diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch new file mode 100644 index 000000000000..c96fc0554522 --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/416985 + +--- src/conffile.c ++++ src/conffile.c +@@ -372,7 +372,7 @@ static int cf_prepare_regexps() + /* A regexp matching a boolean value*/ + + if( regcomp(&declaration_RE, +- "^[[:blank:]]*([-a-zA-Z_]+)[[:blank:]]*" ++ "^[[:blank:]]*([-[:alpha:]_]+)[[:blank:]]*" + "=[[:blank:]]*(.*)$", + REG_EXTENDED )) { + perror(_("Could not compile regular expression for boolean values")); +@@ -392,7 +392,7 @@ static int cf_prepare_regexps() + } + + if( regcomp(&uint_RE, +- "^[[:blank:]]*([a-zA-Z_]+)[[:blank:]]*" ++ "^[[:blank:]]*([[:alpha:]_]+)[[:blank:]]*" + "=[[:blank:]]*([0-9]+)$", + REG_EXTENDED )) { + perror(_("Could not compile regular expression for integer values")); diff --git a/sys-apps/pmount/files/pmount.bash-completion b/sys-apps/pmount/files/pmount.bash-completion new file mode 100644 index 000000000000..31b63020910c --- /dev/null +++ b/sys-apps/pmount/files/pmount.bash-completion @@ -0,0 +1,94 @@ +#-*- mode: shell-script;-*- +# +# Bash Completion snippet for the pmount command +# Copyright (c) Eduard Bloch, 2009-2011 +# +# Supports most (all?) of the possible option sets of version 0.9.18 except of +# too many device/directory arguments, the charset search can also be improved +# +# Inputs: +# $1 -- name of the command whose arguments are being completed +# $2 -- word being completed +# $3 -- word preceding the word being completed +# $COMP_LINE -- current command line +# $COMP_PONT -- cursor position +# $COMP_WORDS -- array containing individual words in the current +# command line +# $COMP_CWORD -- index into ${COMP_WORDS} of the word containing the +# current cursor position +# Output: +# COMPREPLY array variable contains possible completions + +_pmount() { + + local cur prev options devices fslist + + options=' -r --read-only -w --read-write -s --sync -A --noatime -e --exec \ + -t filesystem --type filesystem -c charset --charset charset -u umask \ + --umask umask --dmask dmask --fmask fmask -p file --passphrase file \ + -h --help -d --debug -V --version' + fslist=' ascii cp1250 cp1251 cp1255 cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp932 cp936 cp949 cp950 euc-jp iso8859-1 iso8859-13 iso8859-14 iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 iso8859-9 koi8-r koi8-ru koi8-u utf8' + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + case "$prev" in + -@(t|-type)) + COMPREPLY=( $( grep "^[[:space:]]$cur" /proc/filesystems ) ) + return 0 + ;; + + -@(c|-charset)) + COMPREPLY=( $( compgen -W "$fslist" -- $cur ) ) + return 0 + ;; + -@(u|d|-umask|-dmask)) + COMPREPLY=( ${cur}0 ${cur}1 ${cur}2 ${cur}3 ${cur}4 ${cur}5 ${cur}6 ${cur}7 ) + return 0 + ;; + + -@(p|-passphrase)) + _filedir + return 0 + ;; + + esac + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W "$options" -- $cur ) ) + else + devices="$( command ls $(grep -v '^[[:space:]]*#' /etc/pmount.allow ) $(grep 1 /sys/block/*/removable | sed -e 's,/sys/block/,/dev/,;s,/removable:1,*,') 2>/dev/null | sort -u | sed -e 's,\(^/dev/\)\(.*\),\1\2 \2,' )" + COMPREPLY=( $( compgen -W "$devices" -- $cur ) ) + fi + + return 0 +} + + +_pumount() { + + local cur prev options devices mdir + + mdir="$(readlink -f /media)" + + options=' -l --luks-force -h --help -d --debug --version' + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W "$options" -- $cur ) ) + else + devices="$( grep $mdir /proc/mounts | sed -e 's,.*/$mdir/,,;s,\ .*,,;s,\(.*\),\1\n/dev/\1,;s,/dev//dev,/dev,' )" + COMPREPLY=( $( compgen -W "$devices" -- $cur ) ) + fi + + return 0 +} + +complete -F _pmount $filenames pmount +complete -F _pumount $filenames pumount + |