parent
82f961a620
commit
3cf8a6029d
Binary file not shown.
Binary file not shown.
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>gentoo_bugs_peep@parallaxshift.com</email>
|
||||
<name>Philippe Chaintreuil</name>
|
||||
</maintainer>
|
||||
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
@ -0,0 +1,9 @@
|
||||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-group
|
||||
|
||||
DESCRIPTION="Group for SQLGrey"
|
||||
ACCT_GROUP_ID=336
|
Binary file not shown.
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>gentoo_bugs_peep@parallaxshift.com</email>
|
||||
<name>Philippe Chaintreuil</name>
|
||||
</maintainer>
|
||||
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
@ -0,0 +1,14 @@
|
||||
# Copyright 2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="User for SQLGrey"
|
||||
|
||||
ACCT_USER_ID=336
|
||||
ACCT_USER_GROUPS=( sqlgrey )
|
||||
ACCT_USER_HOME="/var/spool/sqlgrey"
|
||||
|
||||
acct-user_add_deps
|
Binary file not shown.
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
Binary file not shown.
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,25 +1,230 @@
|
||||
From 198e62063ed817357204284a15f95ffc7230044c Mon Sep 17 00:00:00 2001
|
||||
From: Aleksey <rhash.admin@gmail.com>
|
||||
Date: Thu, 2 Jan 2020 21:16:51 +0300
|
||||
Subject: [PATCH] fix segfault on rhash -rc
|
||||
|
||||
---
|
||||
file.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 8537968..9724c9d 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,7 @@
|
||||
+Tue 07 Jan 2020 Aleksey
|
||||
+ * Bugfix: restore behavior of 'rhash -rc' to be the same as in v1.3.8
|
||||
+ * Bugfix: fix a segfault and memory errors
|
||||
+
|
||||
Sat 14 Dec 2019 Aleksey
|
||||
* === Version 1.3.9 ===
|
||||
|
||||
diff --git a/calc_sums.c b/calc_sums.c
|
||||
index a76c8c9..0f25224 100644
|
||||
--- a/calc_sums.c
|
||||
+++ b/calc_sums.c
|
||||
@@ -535,6 +535,7 @@ int check_hash_file(file_t* file, int chdir)
|
||||
log_error_msg_file_t(_("file is binary: %s\n"), file);
|
||||
if (fd != stdin)
|
||||
fclose(fd);
|
||||
+ file_cleanup(&parent_dir);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -586,6 +587,7 @@ int check_hash_file(file_t* file, int chdir)
|
||||
rhash_data.miss++;
|
||||
rhash_data.processed++;
|
||||
}
|
||||
+ file_cleanup(&parent_dir);
|
||||
time = rsh_timer_stop(&timer);
|
||||
|
||||
if (res >= -1 && (rsh_fprintf(rhash_data.out, "%s\n", str_set(buf, '-', 80)) < 0 ||
|
||||
diff --git a/file.c b/file.c
|
||||
index 6f593f9..0d18f45 100644
|
||||
index 6f593f9..2f0eb2a 100644
|
||||
--- a/file.c
|
||||
+++ b/file.c
|
||||
@@ -361,8 +361,9 @@ int file_init_by_print_path(file_t* file, file_t* prepend_dir, const char* print
|
||||
const char* path = make_path(prepend_dir->real_path, print_path, 0);
|
||||
file_init(file, path, init_flags & ~FileInitReusePath);
|
||||
@@ -266,7 +266,7 @@ static int detect_path_encoding(file_t* file, wchar_t* dir_path, const char* pri
|
||||
int i;
|
||||
assert(file && !file->real_path);
|
||||
file->mode &= ~FileMaskStatBits;
|
||||
- if (!dir_path && ascii)
|
||||
+ if (ascii)
|
||||
file->mode |= FileIsAsciiPrintPath;
|
||||
/* detect encoding in two or four steps */
|
||||
for (i = 0; i < 4; i += step) {
|
||||
@@ -333,45 +333,39 @@ int file_init_by_print_path(file_t* file, file_t* prepend_dir, const char* print
|
||||
#ifdef _WIN32
|
||||
{
|
||||
const char** primary_path;
|
||||
- const char* dir_primary_path;
|
||||
wchar_t* dir_path = (prepend_dir && !IS_DOT_TSTR(prepend_dir->real_path) ? prepend_dir->real_path : NULL);
|
||||
int encoding = detect_path_encoding(file, dir_path, print_path, init_flags);
|
||||
if (encoding < 0)
|
||||
return -1;
|
||||
if (encoding == 0) {
|
||||
primary_path = &file->print_path;
|
||||
- dir_primary_path = (prepend_dir ? file_get_print_path(prepend_dir, FPathUtf8) : NULL);
|
||||
} else {
|
||||
primary_path = &file->native_path;
|
||||
- dir_primary_path = (prepend_dir ? file_get_print_path(prepend_dir, FPathNative) : NULL);
|
||||
}
|
||||
- if ((!dir_primary_path || IS_DOT_TSTR(dir_primary_path)) &&
|
||||
- (init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
|
||||
+ if ((init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
|
||||
*primary_path = print_path;
|
||||
file->mode |= (encoding == 0 ? FileDontFreePrintPath : FileDontFreeNativePath);
|
||||
} else {
|
||||
- *primary_path = make_path(dir_primary_path, print_path, 1);
|
||||
+ *primary_path = rsh_strdup(print_path);
|
||||
}
|
||||
- return 0;
|
||||
}
|
||||
#else
|
||||
if (!prepend_dir || IS_DOT_STR(prepend_dir->real_path)) {
|
||||
- file_init(file, print_path, init_flags);
|
||||
+ file_init(file, print_path, init_flags & (FileInitReusePath | FileMaskModeBits));
|
||||
} else {
|
||||
- const char* path = make_path(prepend_dir->real_path, print_path, 0);
|
||||
- file_init(file, path, init_flags & ~FileInitReusePath);
|
||||
+ file->real_path = make_path(prepend_dir->real_path, print_path, 0);
|
||||
+ file->mode = init_flags & FileMaskModeBits;
|
||||
}
|
||||
- if (!prepend_dir || IS_DOT_STR(prepend_dir->print_path) ||
|
||||
- (!prepend_dir->print_path && opt.path_separator != ALIEN_PATH_SEPARATOR)) {
|
||||
+ if (!prepend_dir || (prepend_dir->print_path ?
|
||||
+ IS_DOT_STR(prepend_dir->print_path) :
|
||||
+ opt.path_separator != ALIEN_PATH_SEPARATOR)) {
|
||||
if ((init_flags & FileInitReusePath) != 0) {
|
||||
file->print_path = print_path;
|
||||
file->mode |= FileDontFreePrintPath;
|
||||
- if ((init_flags & FileInitReusePath) != 0) {
|
||||
- file->print_path = print_path;
|
||||
- file->mode |= FileDontFreePrintPath;
|
||||
- } else
|
||||
- file->print_path = rsh_strdup(print_path);
|
||||
+ assert(file->print_path == NULL);
|
||||
+ if ((init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
|
||||
+ file->print_path = print_path;
|
||||
+ file->mode |= FileDontFreePrintPath;
|
||||
} else {
|
||||
- file->print_path = make_path(file_get_print_path(prepend_dir, FPathPrimaryEncoding), print_path, 1);
|
||||
+ file->print_path = rsh_strdup(print_path);
|
||||
}
|
||||
#endif
|
||||
+ /* note: flag FileInitUpdatePrintPathLastSlash is used only with file_init() */
|
||||
+ assert((init_flags & FileInitUpdatePrintPathLastSlash) == 0);
|
||||
if ((init_flags & (FileInitRunFstat | FileInitRunLstat)) &&
|
||||
file_stat(file, (init_flags & FileInitRunLstat)) < 0)
|
||||
return -1;
|
||||
@@ -544,9 +538,10 @@ static char* get_modified_path(const char* path, const char* str, int operation)
|
||||
end_pos = strlen(path);
|
||||
start_pos = (end_pos > 0 ? end_pos - 1 : 0);
|
||||
for (; start_pos > 0 && !IS_ANY_SLASH(path[start_pos]); start_pos--);
|
||||
- for (; start_pos > 0 && IS_ANY_SLASH(path[start_pos]); start_pos--);
|
||||
- if (start_pos == 0)
|
||||
+ if (start_pos == 0 && !IS_ANY_SLASH(path[start_pos]))
|
||||
return rsh_strdup(".");
|
||||
+ for (; start_pos > 0 && IS_ANY_SLASH(path[start_pos]); start_pos--);
|
||||
+ start_pos++;
|
||||
} else {
|
||||
char* point = strrchr(path, '.');
|
||||
if (!point)
|
||||
@@ -580,9 +575,10 @@ static tpath_t get_modified_tpath(ctpath_t path, const char* str, int operation)
|
||||
end_pos = wcslen(path);
|
||||
start_pos = (end_pos > 0 ? end_pos - 1 : 0);
|
||||
for (; start_pos > 0 && !IS_ANY_TSLASH(path[start_pos]); start_pos--);
|
||||
- for (; start_pos > 0 && IS_ANY_TSLASH(path[start_pos]); start_pos--);
|
||||
- if (start_pos == 0)
|
||||
+ if (start_pos == 0 && !IS_ANY_TSLASH(path[start_pos]))
|
||||
return rsh_wcsdup(L".");
|
||||
+ for (; start_pos > 0 && IS_ANY_TSLASH(path[start_pos]); start_pos--);
|
||||
+ start_pos++;
|
||||
} else {
|
||||
rsh_tchar* point = wcsrchr(path, L'.');
|
||||
if (!point)
|
||||
diff --git a/hash_check.c b/hash_check.c
|
||||
index 1f9c936..582a09d 100644
|
||||
--- a/hash_check.c
|
||||
+++ b/hash_check.c
|
||||
@@ -210,9 +210,9 @@ static int detect_hash_type(char** ptr, char* end, int* p_len)
|
||||
} else {
|
||||
/* search backward (but no more then 129 symbols) */
|
||||
if ((p - end) >= 129) end = p - 129;
|
||||
- for (; p >= end && p[-1] == '='; eq_num++, p--)
|
||||
+ for (; p > end && p[-1] == '='; eq_num++, p--)
|
||||
char_type = FmtBase64;
|
||||
- for (; p >= end && (next_type &= test_hash_char(p[-1])); len++, p--)
|
||||
+ for (; p > end && (next_type &= test_hash_char(p[-1])); len++, p--)
|
||||
char_type = next_type;
|
||||
}
|
||||
if ((char_type & FmtBase64) != 0)
|
||||
diff --git a/tests/test_rhash.sh b/tests/test_rhash.sh
|
||||
index 8c6e40d..db41b19 100755
|
||||
--- a/tests/test_rhash.sh
|
||||
+++ b/tests/test_rhash.sh
|
||||
@@ -84,12 +84,9 @@ remove_tmpdir()
|
||||
trap remove_tmpdir EXIT
|
||||
|
||||
# prepare test files
|
||||
-SUBDIR=$RHASH_TMP/dir1
|
||||
-mkdir $RHASH_TMP $SUBDIR || die "Unable to create tmp dir."
|
||||
+mkdir $RHASH_TMP || die "Unable to create tmp dir."
|
||||
+cp "$SCRIPT_DIR/test1K.data" $RHASH_TMP/test1K.data
|
||||
cd "$RHASH_TMP"
|
||||
-cp "$SCRIPT_DIR/test1K.data" test1K.data
|
||||
-FILE_A=dir1/a.txt
|
||||
-printf "a" > $FILE_A
|
||||
|
||||
# get the list of supported hash options
|
||||
HASHOPT="`$rhash --list-hashes|sed 's/ .*$//;/[^23]-/s/-\([0-9R]\)/\1/'|tr A-Z a-z`"
|
||||
@@ -207,14 +204,13 @@ TEST_EXPECTED="(message) 1 E8B7BE43 5c334qy BTAXLOOA6G3KQMODTHRGS5ZGME hvfkN/qlp
|
||||
check "$TEST_RESULT" "$TEST_EXPECTED"
|
||||
|
||||
new_test "test %u modifier: "
|
||||
-cp $FILE_A "dir1/=@+.txt"
|
||||
+mkdir dir1 && printf "a" > "dir1/=@+.txt"
|
||||
TEST_RESULT=$( $rhash -p '%uf %Uf %up %Up %uxc %uxC %ubc %ubC\n' "dir1/=@+.txt" )
|
||||
TEST_EXPECTED="%3d%40%2b.txt %3D%40%2B.txt dir1%2f%3d%40%2b.txt dir1%2F%3D%40%2B.txt e8b7be43 E8B7BE43 5c334qy 5C334QY"
|
||||
check "$TEST_RESULT" "$TEST_EXPECTED" .
|
||||
TEST_RESULT=$( $rhash -p '%uBc %UBc %Bc %u@c %U@c\n' -m "a" )
|
||||
TEST_EXPECTED="6Le%2bQw%3d%3d 6Le%2BQw%3D%3D 6Le+Qw== %e8%b7%beC %E8%B7%BEC"
|
||||
check "$TEST_RESULT" "$TEST_EXPECTED"
|
||||
-rm -f "dir1/=@+.txt"
|
||||
|
||||
new_test "test special characters: "
|
||||
TEST_RESULT=$( $rhash -p '\63\1\277\x0f\x1\t\\ \x34\r' -m "" )
|
||||
@@ -252,7 +248,9 @@ TEST_RESULT=$( $rhash --simple -a test1K.data | $rhash -vc - 2>/dev/null | grep
|
||||
match "$TEST_RESULT" "^test1K.data *OK"
|
||||
|
||||
new_test "test checking magnet link: "
|
||||
-TEST_RESULT=$( $rhash --magnet -a test1K.data | $rhash -vc - 2>&1 | grep test1K.data )
|
||||
+# also test that '--check' verifies files in the current directory
|
||||
+mkdir magnet_dir && $rhash --magnet -a test1K.data > magnet_dir/t.magnet
|
||||
+TEST_RESULT=$( $rhash -vc magnet_dir/t.magnet 2>&1 | grep test1K.data )
|
||||
TEST_EXPECTED="^test1K.data *OK"
|
||||
match "$TEST_RESULT" "$TEST_EXPECTED"
|
||||
|
||||
@@ -283,6 +281,20 @@ TEST_RESULT=$( $rhash --simple --embed-crc --embed-crc-delimiter=_ 'test.data' 2
|
||||
check "$TEST_RESULT" "d3d99e8b test_[D3D99E8B].data"
|
||||
rm 'test_[D3D99E8B].data' 'test_[D3D99E8C].data'
|
||||
|
||||
+new_test "test checking recursively: "
|
||||
+mkdir -p check/a && cp test1K.data check/a/b.data
|
||||
+echo "a/b.data B70B4C26" > check/b.sfv
|
||||
+TEST_RESULT=$( $rhash -Crc check/ | grep b.data )
|
||||
+match "$TEST_RESULT" "^a/b.data *OK" .
|
||||
+echo "B70B4C26" > check/a/b.data.crc32
|
||||
+TEST_RESULT=$( $rhash --crc-accept=.crc32 -Crc check/a | grep "data.*OK" )
|
||||
+match "$TEST_RESULT" "^check/a.b.data *OK" .
|
||||
+# test that hash-files specified explicitly by command line are checked
|
||||
+# in the current directory even with '--recursive' option
|
||||
+echo "test1K.data B70B4C26" > check/t.sfv
|
||||
+TEST_RESULT=$( $rhash -Crc check/t.sfv | grep "data.*OK" )
|
||||
+match "$TEST_RESULT" "^test1K.data *OK"
|
||||
+
|
||||
new_test "test wrong sums detection: "
|
||||
$rhash -p '%c\n%m\n%e\n%h\n%g\n%t\n%a\n%w\n' -m WRONG > t.sum
|
||||
TEST_RESULT=$( $rhash -vc t.sum 2>&1 | grep 'OK' )
|
||||
@@ -290,8 +302,7 @@ check "$TEST_RESULT" ""
|
||||
rm t.sum
|
||||
|
||||
new_test "test *accept options: "
|
||||
-rm -rf test_dir/
|
||||
-mkdir -p test_dir && touch test_dir/file.txt test_dir/file.bin
|
||||
+mkdir test_dir && touch test_dir/file.txt test_dir/file.bin
|
||||
# correctly handle MIGW posix path conversion
|
||||
echo "$MSYSTEM" | grep -q '^MINGW[36][24]' && SLASH=// || SLASH="/"
|
||||
# test also --path-separator option
|
||||
@@ -301,7 +312,6 @@ TEST_RESULT=$( $rhash -rC --simple --accept=.txt --path-separator=\\ test_dir )
|
||||
check "$TEST_RESULT" "00000000 test_dir\\file.txt" .
|
||||
TEST_RESULT=$( $rhash -rc --crc-accept=.bin test_dir 2>/dev/null | sed -n '/Verifying/s/-//gp' )
|
||||
match "$TEST_RESULT" "( Verifying test_dir.file\\.bin )"
|
||||
-rm -rf test_dir/
|
||||
|
||||
new_test "test ignoring of log files: "
|
||||
touch t1.out t2.out
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
Binary file not shown.
@ -0,0 +1 @@
|
||||
DIST protontricks-1.3.1.tar.gz 57784 BLAKE2B ed013367a2cc2384e4340379e2c23999a556ed26920ad59dfd7a8f773e490ee76e253a5fe3216e651cdcdb3e225a2e394255500c611d24f6bf9029582d55bb1f SHA512 4e33334e219db2e6679b430ee42408529478834c80c7da3b9bece4756eb27b9331d49a6a884de8a7ced5ec29d78ce831fee4cfbf6d5adcd750666b7e7a1e5607
|
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>marecki@gentoo.org</email>
|
||||
<name>Marek Szuba</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
A simple wrapper script that allows you to easily run Winetricks commands for Steam Play/Proton
|
||||
games. This is often useful when a game requires closed-source runtime libraries that are not
|
||||
included with Proton, or to activate Gallium Nine (native Direct3D 9 support) for a Proton game,
|
||||
without all the tedious messing around with Wine prefixes.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="gui">Enable the graphical user interface (requires <pkg>gnome-extra/zenity</pkg>)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">Matoking/protontricks</remote-id>
|
||||
<remote-id type="pypi">protontricks</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
|
||||
DISTUTILS_SINGLE_IMPL=1
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
|
||||
HOMEPAGE="https://github.com/Matoking/protontricks"
|
||||
SRC_URI="https://codeload.github.com/Matoking/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+gui"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
app-emulation/winetricks
|
||||
dev-python/vdf[${PYTHON_USEDEP}]
|
||||
gui? ( gnome-extra/zenity
|
||||
|| (
|
||||
app-emulation/winetricks[gtk]
|
||||
app-emulation/winetricks[kde]
|
||||
)
|
||||
)"
|
||||
|
||||
DOCS=(CHANGELOG.md README.md)
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
|
||||
if ! use gui; then
|
||||
ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
|
||||
ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
elog "Protontricks can only find games for which a Proton prefix already exists."
|
||||
elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
|
||||
elog
|
||||
}
|
Binary file not shown.
@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>crypto@gentoo.org</email>
|
||||
<name>Crypto</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
DIST manpages-da-0.1.2.tar.gz 8962 BLAKE2B 27a0ee206f137b818019ee74fb4091a9b30e526c16a40f763f4070c9fe5932ef48d50f06c2443c377c86af78c3f7f50a9275db258863bfb800f93c703c86e623 SHA512 7642908f5952f54c0db6af6886b6592e10889d8734776d8d42fe923b084ef85732820d40a095936e6f1bf48d9430b401afeb28202e530b5a48e4a3447ed5c4c6
|
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="A somewhat comprehensive collection of Danish Linux man pages"
|
||||
HOMEPAGE="http://www.sslug.dk/locale/man-sider/"
|
||||
SRC_URI="http://www.sslug.dk/locale/man-sider/manpages-da-${PV}.tar.gz"
|
||||
|
||||
LICENSE="freedist"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="virtual/man"
|
||||
|
||||
S=${WORKDIR}/manpages-da-${PV}
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/man
|
||||
emake install-data PREFIX="${D}"/usr/share
|
||||
dodoc AUTHORS ChangeLog
|
||||
}
|
Binary file not shown.
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
|
||||
inherit python-single-r1
|
||||
|
||||
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
|
||||
HOMEPAGE="http://byobu.co"
|
||||
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="screen"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-libs/newt[${PYTHON_USEDEP}]
|
||||
screen? ( app-misc/screen )
|
||||
!screen? ( app-misc/tmux )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
python_fix_shebang .
|
||||
|
||||
# Set default system backend to screen
|
||||
if use screen ; then
|
||||
sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Create symlinks for backends
|
||||
dosym ${PN} /usr/bin/${PN}-screen
|
||||
dosym ${PN} /usr/bin/${PN}-tmux
|
||||
|
||||
docompress -x /usr/share/doc/${PN}
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
|
@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>grozin@gentoo.org</email>
|
||||
<name>Andrey Grozin</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
A small python-gtk application, which helps the user to merge or split pdf documents
|
||||
and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface.
|
||||
It is a frontend for pikepdf.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">jeromerobert/pdfarranger</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
|
||||
HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
|
||||
SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
RDEPEND="dev-python/pikepdf"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/python-distutils-extra"
|
@ -1 +1,2 @@
|
||||
DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
|
||||
DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
|
||||
|
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit gnome2-utils meson xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
|
||||
EGIT_BRANCH="develop"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="DjVu plug-in for zathura"
|
||||
HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="app-text/djvu
|
||||
>=app-text/zathura-0.3.9
|
||||
dev-libs/girara
|
||||
dev-libs/glib:2
|
||||
x11-libs/cairo"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
}
|
@ -1 +1,2 @@
|
||||
DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
|
||||
DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
|
||||
|
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit meson xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
|
||||
EGIT_BRANCH="develop"
|
||||
else
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="PDF plug-in for zathura"
|
||||
HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
|
||||
DEPEND="app-text/poppler[cairo]
|
||||
>=app-text/zathura-0.3.9
|
||||
dev-libs/girara
|
||||
dev-libs/glib:2"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue