public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/bup] f44: Dropped obsolete patches.
@ 2026-10-30 14:54 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-10-30 14:54 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/bup
Branch : f44
Commit : eec6ca92a97598c39ca250fb99ba4d3907cc5de5
Author : Tadej Janež <tadej.j@nez.si>
Date   : 2017-01-10T15:34:38+01:00
Stats  : +0/-955 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/bup/c/eec6ca92a97598c39ca250fb99ba4d3907cc5de5?branch=f44

Log:
Dropped obsolete patches.

---
diff --git a/0001-Tests-replace-calls-to-python-with-calls-to-PYTHON.patch b/0001-Tests-replace-calls-to-python-with-calls-to-PYTHON.patch
deleted file mode 100644
index 364f412..0000000
--- a/0001-Tests-replace-calls-to-python-with-calls-to-PYTHON.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From c13fd7e7618d6f9509af023551774e3258f52145 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
-Date: Sun, 10 May 2015 21:08:31 +0200
-Subject: [PATCH 1/6] Tests: replace calls to 'python' with calls to '$PYTHON'.
-
-Since it is possible to specify which Python executable to use by
-setting the 'PYTHON' environment variable, it is more consistent to
-always refer to '$PYTHON' in the tests.
----
- t/lib.sh                    |  2 +-
- t/test-fuse.sh              |  2 +-
- t/test-ls.sh                |  6 +++---
- t/test-meta.sh              | 12 ++++++------
- t/test-restore-map-owner.sh |  2 +-
- t/test-sparse-files.sh      |  2 +-
- 6 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/t/lib.sh b/t/lib.sh
-index 84b9421..eb5817e 100644
---- a/t/lib.sh
-+++ b/t/lib.sh
-@@ -11,7 +11,7 @@ realpath()
- {
-     test "$#" -eq 1 || return $?
-     echo "$1" | \
--        PYTHONPATH="$bup_t_lib_script_home/../lib" python -c \
-+        PYTHONPATH="$bup_t_lib_script_home/../lib" $PYTHON -c \
-         "import sys, bup.helpers; print bup.helpers.realpath(sys.stdin.readline())" \
-         || return $?
- }
-diff --git a/t/test-fuse.sh b/t/test-fuse.sh
-index c199182..94510ae 100755
---- a/t/test-fuse.sh
-+++ b/t/test-fuse.sh
-@@ -31,7 +31,7 @@ bup() { "$top/bup" "$@"; }
- WVPASS bup init
- WVPASS cd "$tmpdir"
- 
--savestamp1=$(WVPASS python -c 'import time; print int(time.time())') || exit $?
-+savestamp1=$(WVPASS $PYTHON -c 'import time; print int(time.time())') || exit $?
- savestamp2=$(($savestamp1 + 1))
- savename1="$(printf '%(%Y-%m-%d-%H%M%S)T' "$savestamp1")" || exit $?
- savename2="$(printf '%(%Y-%m-%d-%H%M%S)T' "$savestamp2")" || exit $?
-diff --git a/t/test-ls.sh b/t/test-ls.sh
-index 77c5d09..9aedd13 100755
---- a/t/test-ls.sh
-+++ b/t/test-ls.sh
-@@ -130,7 +130,7 @@ symlink_date="$(WVPASS echo "$symlink_bup_info" \
-     || exit $?
- 
- if test "$(uname -s)" != NetBSD; then
--    symlink_size="$(WVPASS python -c "import os
-+    symlink_size="$(WVPASS $PYTHON -c "import os
- print os.lstat('src/symlink').st_size")" || exit $?
- else
-     # NetBSD appears to return varying sizes, so for now, just ignore it.
-@@ -140,9 +140,9 @@ else
- fi
- 
- uid="$(id -u)" || exit $?
--gid="$(python -c 'import os; print os.stat("src").st_gid')" || exit $?
-+gid="$($PYTHON -c 'import os; print os.stat("src").st_gid')" || exit $?
- user="$(id -un)" || exit $?
--group="$(python -c 'import grp, os;
-+group="$($PYTHON -c 'import grp, os;
- print grp.getgrgid(os.stat("src").st_gid)[0]')" || exit $?
- 
- WVPASSEQ "$(bup ls -l src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-diff --git a/t/test-meta.sh b/t/test-meta.sh
-index 2c886cc..9115ab8 100755
---- a/t/test-meta.sh
-+++ b/t/test-meta.sh
-@@ -435,9 +435,9 @@ src/foo/3"
- 
-     tmpdir="$(WVPASS wvmktempdir)" || exit $?    
- 
--    first_group="$(WVPASS python -c 'import os,grp; \
-+    first_group="$(WVPASS $PYTHON -c 'import os,grp; \
-       print grp.getgrgid(os.getgroups()[0])[0]')" || exit $?
--    last_group="$(python -c 'import os,grp; \
-+    last_group="$($PYTHON -c 'import os,grp; \
-       print grp.getgrgid(os.getgroups()[-1])[0]')" || exit $?
-     last_group_erx="$(escape-erx "$last_group")"
- 
-@@ -675,7 +675,7 @@ if [ "$root_status" = root ]; then
-             WVPASS mkdir "$testfs"/src/foo
-             WVPASS touch "$testfs"/src/bar
-             PYTHONPATH="$TOP/lib" \
--                WVPASS python -c "from bup import xstat; \
-+                WVPASS $PYTHON -c "from bup import xstat; \
-                 x = xstat.timespec_to_nsecs((42, 0));\
-                    xstat.utime('$testfs/src/foo', (x, x));\
-                    xstat.utime('$testfs/src/bar', (x, x));"
-@@ -716,7 +716,7 @@ if [ "$root_status" = root ]; then
-                 WVPASS cd "$testfs_limited"/src-restore
-                 WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
-                     | WVPASS grep -e '^Linux chattr:' \
--                    | WVPASS python -c \
-+                    | WVPASS $PYTHON -c \
-                     'import sys; exit(not len(sys.stdin.readlines()) == 3)'
-             ) || exit $?
-         ) || exit $?
-@@ -740,7 +740,7 @@ if [ "$root_status" = root ]; then
-             WVFAIL bup meta --extract --file "$testfs"/src.meta
-             WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
-                 | WVPASS grep -e "^xattr\.set '" \
--                | WVPASS python -c \
-+                | WVPASS $PYTHON -c \
-                 'import sys; exit(not len(sys.stdin.readlines()) == 2)'
-         ) || exit $?
- 
-@@ -762,7 +762,7 @@ if [ "$root_status" = root ]; then
-             WVPASS cd "$testfs_limited"/src-restore
-             WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \
-                 | WVPASS grep -e '^POSIX1e ACL applyto:' \
--                | WVPASS python -c \
-+                | WVPASS $PYTHON -c \
-                 'import sys; exit(not len(sys.stdin.readlines()) == 2)'
-         ) || exit $?
- 
-diff --git a/t/test-restore-map-owner.sh b/t/test-restore-map-owner.sh
-index e5eeee3..220071b 100755
---- a/t/test-restore-map-owner.sh
-+++ b/t/test-restore-map-owner.sh
-@@ -79,7 +79,7 @@ WVPASS grep -qE "^uid: $other_uid\$" foo-xstat
- WVPASS grep -qE "^group: $other_group\$" foo-xstat
- WVPASS grep -qE "^gid: $other_gid\$" foo-xstat
- 
--has_uid_gid_0=$(WVPASS python -c "
-+has_uid_gid_0=$(WVPASS $PYTHON -c "
- import grp, pwd
- try:
-   pwd.getpwuid(0)
-diff --git a/t/test-sparse-files.sh b/t/test-sparse-files.sh
-index 82275ff..9f9307d 100755
---- a/t/test-sparse-files.sh
-+++ b/t/test-sparse-files.sh
-@@ -18,7 +18,7 @@ WVPASS cd "$tmpdir"
- 
- # The 3MB guess is semi-arbitrary, but we've been informed that
- # Lustre, for example, uses 1MB, so guess higher than that, at least.
--block_size=$(python -c \
-+block_size=$($PYTHON -c \
-   "import os; print getattr(os.stat('.'), 'st_blksize', 0) or $mb * 3") \
-     || exit $?
- data_size=$((block_size * 10))
--- 
-2.1.0
-

diff --git a/0002-Replace-all-python-shebangs-with-explicit-python2-sh.patch b/0002-Replace-all-python-shebangs-with-explicit-python2-sh.patch
deleted file mode 100644
index b794160..0000000
--- a/0002-Replace-all-python-shebangs-with-explicit-python2-sh.patch
+++ /dev/null
@@ -1,504 +0,0 @@
-From 1b88ebfa2c827e7a8354b167a2fd58df0be7e013 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
-Date: Sun, 10 May 2015 21:31:27 +0200
-Subject: [PATCH 2/6] Replace all python shebangs with explicit python2
- shebangs.
-
-Distributions are switching to Python3 by default (e.g. Fedora 23,
-Ubuntu 16.04 LTS) and using explicit python2 shebangs will ensure
-that bup still works properly after the switch.
----
- cmd/bloom-cmd.py            | 2 +-
- cmd/cat-file-cmd.py         | 2 +-
- cmd/daemon-cmd.py           | 2 +-
- cmd/damage-cmd.py           | 2 +-
- cmd/drecurse-cmd.py         | 2 +-
- cmd/fsck-cmd.py             | 2 +-
- cmd/ftp-cmd.py              | 2 +-
- cmd/fuse-cmd.py             | 2 +-
- cmd/help-cmd.py             | 2 +-
- cmd/import-duplicity-cmd.py | 2 +-
- cmd/index-cmd.py            | 2 +-
- cmd/init-cmd.py             | 2 +-
- cmd/join-cmd.py             | 2 +-
- cmd/list-idx-cmd.py         | 2 +-
- cmd/ls-cmd.py               | 2 +-
- cmd/margin-cmd.py           | 2 +-
- cmd/memtest-cmd.py          | 2 +-
- cmd/meta-cmd.py             | 2 +-
- cmd/midx-cmd.py             | 2 +-
- cmd/mux-cmd.py              | 2 +-
- cmd/newliner-cmd.py         | 2 +-
- cmd/on--server-cmd.py       | 2 +-
- cmd/on-cmd.py               | 2 +-
- cmd/random-cmd.py           | 2 +-
- cmd/restore-cmd.py          | 2 +-
- cmd/save-cmd.py             | 2 +-
- cmd/server-cmd.py           | 2 +-
- cmd/split-cmd.py            | 2 +-
- cmd/tag-cmd.py              | 2 +-
- cmd/tick-cmd.py             | 2 +-
- cmd/version-cmd.py          | 2 +-
- cmd/web-cmd.py              | 2 +-
- cmd/xstat-cmd.py            | 2 +-
- config/configure            | 4 ++--
- main.py                     | 2 +-
- t/cleanup-mounts-under      | 2 +-
- t/hardlink-sets             | 2 +-
- t/id-other-than             | 2 +-
- t/mksock                    | 2 +-
- t/ns-timestamp-resolutions  | 2 +-
- t/root-status               | 2 +-
- t/subtree-hash              | 2 +-
- t/unknown-owner             | 2 +-
- wvtest.py                   | 2 +-
- 44 files changed, 45 insertions(+), 45 deletions(-)
-
-diff --git a/cmd/bloom-cmd.py b/cmd/bloom-cmd.py
-index cd4506d..68dab80 100755
---- a/cmd/bloom-cmd.py
-+++ b/cmd/bloom-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, glob, tempfile
- from bup import options, git, bloom
- from bup.helpers import *
-diff --git a/cmd/cat-file-cmd.py b/cmd/cat-file-cmd.py
-index 8948ff2..b1aa78b 100755
---- a/cmd/cat-file-cmd.py
-+++ b/cmd/cat-file-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, stat
- from bup import options, git, vfs
- from bup.helpers import *
-diff --git a/cmd/daemon-cmd.py b/cmd/daemon-cmd.py
-index c90e3e4..ddfc70a 100755
---- a/cmd/daemon-cmd.py
-+++ b/cmd/daemon-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, getopt, socket, subprocess, fcntl
- from bup import options, path
- from bup.helpers import *
-diff --git a/cmd/damage-cmd.py b/cmd/damage-cmd.py
-index 49dbed0..a1e6c2d 100755
---- a/cmd/damage-cmd.py
-+++ b/cmd/damage-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, random
- from bup import options
- from bup.helpers import *
-diff --git a/cmd/drecurse-cmd.py b/cmd/drecurse-cmd.py
-index cdf6680..16af3db 100755
---- a/cmd/drecurse-cmd.py
-+++ b/cmd/drecurse-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- from os.path import relpath
- from bup import options, drecurse
-diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
-index 794c755..e68f624 100755
---- a/cmd/fsck-cmd.py
-+++ b/cmd/fsck-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, glob, subprocess
- from bup import options, git
- from bup.helpers import *
-diff --git a/cmd/ftp-cmd.py b/cmd/ftp-cmd.py
-index baa1e08..846649d 100755
---- a/cmd/ftp-cmd.py
-+++ b/cmd/ftp-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, stat, fnmatch
- from bup import options, git, shquote, vfs, ls
- from bup.helpers import *
-diff --git a/cmd/fuse-cmd.py b/cmd/fuse-cmd.py
-index 30776cb..b0ec725 100755
---- a/cmd/fuse-cmd.py
-+++ b/cmd/fuse-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, errno
- from bup import options, git, vfs, xstat
- from bup.helpers import *
-diff --git a/cmd/help-cmd.py b/cmd/help-cmd.py
-index 56a4148..ed7cd61 100755
---- a/cmd/help-cmd.py
-+++ b/cmd/help-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, glob
- from bup import options, path
- 
-diff --git a/cmd/import-duplicity-cmd.py b/cmd/import-duplicity-cmd.py
-index 163d4fa..3b72d37 100755
---- a/cmd/import-duplicity-cmd.py
-+++ b/cmd/import-duplicity-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- from calendar import timegm
- from pipes import quote
-diff --git a/cmd/index-cmd.py b/cmd/index-cmd.py
-index 6f2adf4..93554da 100755
---- a/cmd/index-cmd.py
-+++ b/cmd/index-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys, stat, time, os, errno, re
- from bup import metadata, options, git, index, drecurse, hlinkdb
-diff --git a/cmd/init-cmd.py b/cmd/init-cmd.py
-index 2e4a151..cd86612 100755
---- a/cmd/init-cmd.py
-+++ b/cmd/init-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys
- 
- from bup import git, options, client
-diff --git a/cmd/join-cmd.py b/cmd/join-cmd.py
-index 042b402..dfbf5a5 100755
---- a/cmd/join-cmd.py
-+++ b/cmd/join-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys
- from bup import git, options, client
- from bup.helpers import *
-diff --git a/cmd/list-idx-cmd.py b/cmd/list-idx-cmd.py
-index a3e3dc9..a9f6477 100755
---- a/cmd/list-idx-cmd.py
-+++ b/cmd/list-idx-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os
- from bup import git, options
- from bup.helpers import *
-diff --git a/cmd/ls-cmd.py b/cmd/ls-cmd.py
-index 94a7131..b00c41d 100755
---- a/cmd/ls-cmd.py
-+++ b/cmd/ls-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys
- from bup import git, vfs, ls
- from bup.helpers import *
-diff --git a/cmd/margin-cmd.py b/cmd/margin-cmd.py
-index 9b7fd60..798512b 100755
---- a/cmd/margin-cmd.py
-+++ b/cmd/margin-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, struct, math
- from bup import options, git, _helpers
- from bup.helpers import *
-diff --git a/cmd/memtest-cmd.py b/cmd/memtest-cmd.py
-index 0e3cf0c..6798d88 100755
---- a/cmd/memtest-cmd.py
-+++ b/cmd/memtest-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, re, struct, time, resource
- from bup import git, bloom, midx, options, _helpers
- from bup.helpers import *
-diff --git a/cmd/meta-cmd.py b/cmd/meta-cmd.py
-index cac26b5..9d43b8a 100755
---- a/cmd/meta-cmd.py
-+++ b/cmd/meta-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- # Copyright (C) 2010 Rob Browning
- #
-diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
-index a18707d..e22d573 100755
---- a/cmd/midx-cmd.py
-+++ b/cmd/midx-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, math, struct, glob, resource
- import tempfile
- from bup import options, git, midx, _helpers, xstat
-diff --git a/cmd/mux-cmd.py b/cmd/mux-cmd.py
-index b70c0a8..49dc3d6 100755
---- a/cmd/mux-cmd.py
-+++ b/cmd/mux-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import os, sys, subprocess, struct
- from bup import options
- from bup.helpers import *
-diff --git a/cmd/newliner-cmd.py b/cmd/newliner-cmd.py
-index 68d327b..c485ee5 100755
---- a/cmd/newliner-cmd.py
-+++ b/cmd/newliner-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, re
- from bup import options
- from bup import _helpers   # fixes up sys.argv on import
-diff --git a/cmd/on--server-cmd.py b/cmd/on--server-cmd.py
-index a6f3e21..e1e284f 100755
---- a/cmd/on--server-cmd.py
-+++ b/cmd/on--server-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, struct
- from bup import options, helpers
- 
-diff --git a/cmd/on-cmd.py b/cmd/on-cmd.py
-index 9d6f683..4be8ad8 100755
---- a/cmd/on-cmd.py
-+++ b/cmd/on-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, struct, getopt, subprocess, signal
- from subprocess import PIPE
- from bup import options, ssh, path
-diff --git a/cmd/random-cmd.py b/cmd/random-cmd.py
-index 4be3660..3fd8a6c 100755
---- a/cmd/random-cmd.py
-+++ b/cmd/random-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys
- from bup import options, _helpers
- from bup.helpers import *
-diff --git a/cmd/restore-cmd.py b/cmd/restore-cmd.py
-index d527489..e4f96cc 100755
---- a/cmd/restore-cmd.py
-+++ b/cmd/restore-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import copy, errno, sys, stat, re
- from bup import options, git, metadata, vfs
- from bup.helpers import *
-diff --git a/cmd/save-cmd.py b/cmd/save-cmd.py
-index fc93408..95c18cf 100755
---- a/cmd/save-cmd.py
-+++ b/cmd/save-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, stat, time, math
- from cStringIO import StringIO
- from errno import EACCES
-diff --git a/cmd/server-cmd.py b/cmd/server-cmd.py
-index 43a3fce..10ec142 100755
---- a/cmd/server-cmd.py
-+++ b/cmd/server-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import os, sys, struct
- from bup import options, git
- from bup.helpers import *
-diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py
-index 70daf7c..a85428e 100755
---- a/cmd/split-cmd.py
-+++ b/cmd/split-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import os, sys, time
- from bup import hashsplit, git, options, client
- from bup.helpers import *
-diff --git a/cmd/tag-cmd.py b/cmd/tag-cmd.py
-index f33855e..b4dd019 100755
---- a/cmd/tag-cmd.py
-+++ b/cmd/tag-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import os
-diff --git a/cmd/tick-cmd.py b/cmd/tick-cmd.py
-index 4d462ad..7b24d1f 100755
---- a/cmd/tick-cmd.py
-+++ b/cmd/tick-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, time
- from bup import options
- 
-diff --git a/cmd/version-cmd.py b/cmd/version-cmd.py
-index 645f25f..fcc2b95 100755
---- a/cmd/version-cmd.py
-+++ b/cmd/version-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys
- from bup import options
- from bup import _version
-diff --git a/cmd/web-cmd.py b/cmd/web-cmd.py
-index 1c515e2..cf4f376 100755
---- a/cmd/web-cmd.py
-+++ b/cmd/web-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, stat, urllib, mimetypes, posixpath, time, webbrowser
- import urllib
- from bup import options, git, vfs
-diff --git a/cmd/xstat-cmd.py b/cmd/xstat-cmd.py
-index 85071d2..2c16d48 100755
---- a/cmd/xstat-cmd.py
-+++ b/cmd/xstat-cmd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # Copyright (C) 2010 Rob Browning
- #
- # This code is covered under the terms of the GNU Library General
-diff --git a/config/configure b/config/configure
-index ccc02b2..2b1b4e5 100755
---- a/config/configure
-+++ b/config/configure
-@@ -42,8 +42,8 @@ if [ -z "$MAKE_VERSION" ]; then
- fi
- expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.81"
- 
--if test -z "$(bup_find_prog python '')"; then
--    AC_FAIL "ERROR: unable to find python"
-+if test -z "$(bup_find_prog python2 '')"; then
-+    AC_FAIL "ERROR: unable to find python2"
- fi
- 
- if test -z "$(bup_find_prog git '')"; then
-diff --git a/main.py b/main.py
-index 45a0e8a..5c7c9d7 100755
---- a/main.py
-+++ b/main.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- import sys, os, subprocess, signal, getopt
- 
- argv = sys.argv
-diff --git a/t/cleanup-mounts-under b/t/cleanup-mounts-under
-index a8ba611..8af0200 100755
---- a/t/cleanup-mounts-under
-+++ b/t/cleanup-mounts-under
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import os.path, re, subprocess, sys
- 
-diff --git a/t/hardlink-sets b/t/hardlink-sets
-index 653b4d2..d3852be 100755
---- a/t/hardlink-sets
-+++ b/t/hardlink-sets
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import os, stat, sys
- 
-diff --git a/t/id-other-than b/t/id-other-than
-index cfa219d..cb76717 100755
---- a/t/id-other-than
-+++ b/t/id-other-than
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import grp
- import pwd
-diff --git a/t/mksock b/t/mksock
-index ee2dbfe..370b753 100755
---- a/t/mksock
-+++ b/t/mksock
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import socket, sys
- 
-diff --git a/t/ns-timestamp-resolutions b/t/ns-timestamp-resolutions
-index d1bb785..2b40243 100755
---- a/t/ns-timestamp-resolutions
-+++ b/t/ns-timestamp-resolutions
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import os, sys
- 
-diff --git a/t/root-status b/t/root-status
-index 9fb12cb..715a651 100755
---- a/t/root-status
-+++ b/t/root-status
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- 
-diff --git a/t/subtree-hash b/t/subtree-hash
-index 691c207..3c0675b 100755
---- a/t/subtree-hash
-+++ b/t/subtree-hash
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import os, sys
- 
-diff --git a/t/unknown-owner b/t/unknown-owner
-index 00442a4..079fab4 100755
---- a/t/unknown-owner
-+++ b/t/unknown-owner
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import grp
- import pwd
-diff --git a/wvtest.py b/wvtest.py
-index cc68601..3f799ba 100755
---- a/wvtest.py
-+++ b/wvtest.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # WvTest:
- #   Copyright (C)2007-2012 Versabanq Innovations Inc. and contributors.
--- 
-2.1.0
-

diff --git a/0003-LICENSE-update-to-the-current-GNU-LGPLv2-text.patch b/0003-LICENSE-update-to-the-current-GNU-LGPLv2-text.patch
deleted file mode 100644
index 5a080c2..0000000
--- a/0003-LICENSE-update-to-the-current-GNU-LGPLv2-text.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From f36eedc3cd7cbb0dc1b2f85404acce75b2e36fef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
-Date: Tue, 16 Jun 2015 14:15:18 +0200
-Subject: [PATCH 3/6] LICENSE: update to the current GNU LGPLv2 text
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The text is taken from
-https://www.gnu.org/licenses/old-licenses/lgpl-2.0.txt.
-Remove form feed characters and trailing whitespace from the file.
-
-Signed-off-by: Tadej Janež <tadej.j@nez.si>
-Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
-Acked-by: Gabriel Filion <gabster@lelutin.ca>
-[rlb@defaultvalue.org: adjust commit summary]
-Reviewed-by: Rob Browning <rlb@defaultvalue.org>
----
- LICENSE | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/LICENSE b/LICENSE
-index f16ccb5..6ed12e5 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -12,18 +12,18 @@ v2.6, file Lib/posixpath.py, hg-commit 95fff5a6a276) and is covered
- under the terms of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2.
- 
- 
--		  GNU LIBRARY GENERAL PUBLIC LICENSE
--		       Version 2, June 1991
-+                  GNU LIBRARY GENERAL PUBLIC LICENSE
-+                       Version 2, June 1991
- 
-  Copyright (C) 1991 Free Software Foundation, Inc.
--                    675 Mass Ave, Cambridge, MA 02139, USA
-+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
- [This is the first released version of the library GPL.  It is
-  numbered 2 because it goes with version 2 of the ordinary GPL.]
- 
--			    Preamble
-+                            Preamble
- 
-   The licenses for most software are designed to take away your
- freedom to share and change it.  By contrast, the GNU General Public
-@@ -65,7 +65,7 @@ library.  If the library is modified by someone else and passed on, we
- want its recipients to know that what they have is not the original
- version, so that any problems introduced by others will not reflect on
- the original authors' reputations.
--\f
-+
-   Finally, any free program is threatened constantly by software
- patents.  We wish to avoid the danger that companies distributing free
- software will individually obtain patent licenses, thus in effect
-@@ -112,8 +112,8 @@ works together with the library.
- 
-   Note that it is possible for a library to be covered by the ordinary
- General Public License rather than by this special one.
--\f
--		  GNU LIBRARY GENERAL PUBLIC LICENSE
-+
-+                  GNU LIBRARY GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
-   0. This License Agreement applies to any software library which
-@@ -147,7 +147,7 @@ such a program is covered only if its contents constitute a work based
- on the Library (independent of the use of the Library in a tool for
- writing it).  Whether that is true depends on what the Library does
- and what the program that uses the Library does.
--  
-+
-   1. You may copy and distribute verbatim copies of the Library's
- complete source code as you receive it, in any medium, provided that
- you conspicuously and appropriately publish on each copy an
-@@ -159,7 +159,7 @@ Library.
-   You may charge a fee for the physical act of transferring a copy,
- and you may at your option offer warranty protection in exchange for a
- fee.
--\f
-+
-   2. You may modify your copy or copies of the Library or any portion
- of it, thus forming a work based on the Library, and copy and
- distribute such modifications or work under the terms of Section 1
-@@ -217,7 +217,7 @@ instead of to this License.  (If a newer version than version 2 of the
- ordinary GNU General Public License has appeared, then you can specify
- that version instead if you wish.)  Do not make any other change in
- these notices.
--\f
-+
-   Once this change is made in a given copy, it is irreversible for
- that copy, so the ordinary GNU General Public License applies to all
- subsequent copies and derivative works made from that copy.
-@@ -268,7 +268,7 @@ Library will still fall under Section 6.)
- distribute the object code for the work under the terms of Section 6.
- Any executables containing that work also fall under Section 6,
- whether or not they are linked directly with the Library itself.
--\f
-+
-   6. As an exception to the Sections above, you may also compile or
- link a "work that uses the Library" with the Library to produce a
- work containing portions of the Library, and distribute that work
-@@ -322,7 +322,7 @@ restrictions of other proprietary libraries that do not normally
- accompany the operating system.  Such a contradiction means you cannot
- use both them and the Library together in an executable that you
- distribute.
--\f
-+
-   7. You may place library facilities that are a work based on the
- Library side-by-side in a single library together with other library
- facilities not covered by this License, and distribute such a combined
-@@ -363,7 +363,7 @@ subject to these terms and conditions.  You may not impose any further
- restrictions on the recipients' exercise of the rights granted herein.
- You are not responsible for enforcing compliance by third parties to
- this License.
--\f
-+
-   11. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues),
- conditions are imposed on you (whether by court order, agreement or
-@@ -415,7 +415,7 @@ conditions either of that version or of any later version published by
- the Free Software Foundation.  If the Library does not specify a
- license version number, you may choose any version ever published by
- the Free Software Foundation.
--\f
-+
-   14. If you wish to incorporate parts of the Library into other free
- programs whose distribution conditions are incompatible with these,
- write to the author to ask for permission.  For software which is
-@@ -425,7 +425,7 @@ decision will be guided by the two goals of preserving the free status
- of all derivatives of our free software and of promoting the sharing
- and reuse of software generally.
- 
--			    NO WARRANTY
-+                            NO WARRANTY
- 
-   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
- WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-@@ -448,9 +448,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
- SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
- 
--		     END OF TERMS AND CONDITIONS
--\f
--     Appendix: How to Apply These Terms to Your New Libraries
-+                     END OF TERMS AND CONDITIONS
-+
-+           How to Apply These Terms to Your New Libraries
- 
-   If you develop a new library, and you want it to be of the greatest
- possible use to the public, we recommend making it free software that
-@@ -477,8 +477,8 @@ convey the exclusion of warranty; and each file should have at least the
-     Library General Public License for more details.
- 
-     You should have received a copy of the GNU Library General Public
--    License along with this library; if not, write to the Free
--    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+    License along with this library; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 
- Also add information on how to contact you by electronic and paper mail.
- 
--- 
-2.1.0
-

diff --git a/0004-Prevent-building-and-installation-of-HTML-documentat.patch b/0004-Prevent-building-and-installation-of-HTML-documentat.patch
deleted file mode 100644
index f508784..0000000
--- a/0004-Prevent-building-and-installation-of-HTML-documentat.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 67105f3b1ebff8d801f1267de8f2fd692d19109a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.janez@tadej.hicsalta.si>
-Date: Sun, 10 May 2015 21:39:25 +0200
-Subject: [PATCH 4/6] Prevent building and installation of HTML documentation.
-
----
- Documentation/Makefile | 2 +-
- Makefile               | 4 ----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 067f698..dab62aa 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -12,7 +12,7 @@ BUP_DATE:=$(shell ../bup version --date)
- 
- default: all
- 
--all: man html
-+all: man
- 
- man: $(patsubst %.md,%.1,$(wildcard *.md))
- 
-diff --git a/Makefile b/Makefile
-index 6c4053a..812f570 100644
---- a/Makefile
-+++ b/Makefile
-@@ -45,10 +45,6 @@ install: all
- 	  $(INSTALL) -m 0644 \
- 		Documentation/*.1 \
- 		$(MANDIR)/man1
--	[ ! -e Documentation/.docs-available ] || \
--	  $(INSTALL) -m 0644 \
--		Documentation/*.html \
--		$(DOCDIR)
- 	$(INSTALL) -pm 0755 bup $(BINDIR)
- 	$(INSTALL) -pm 0755 \
- 		cmd/bup-* \
--- 
-2.1.0
-

diff --git a/0005-Remove-support-for-par2-due-to-issues-with-the-versi.patch b/0005-Remove-support-for-par2-due-to-issues-with-the-versi.patch
deleted file mode 100644
index f26dab1..0000000
--- a/0005-Remove-support-for-par2-due-to-issues-with-the-versi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f9e112a7b2b46af797657fcaa79701c5c48c2982 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
-Date: Fri, 15 May 2015 10:29:47 +0200
-Subject: [PATCH 5/6] Remove support for 'par2' due to issues with the version
- in Fedora.
-
----
- cmd/fsck-cmd.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
-index e68f624..a9fd68a 100755
---- a/cmd/fsck-cmd.py
-+++ b/cmd/fsck-cmd.py
-@@ -139,7 +139,9 @@ disable-par2  ignore par2 even if it is available
- o = options.Options(optspec)
- (opt, flags, extra) = o.parse(sys.argv[1:])
- 
--par2_setup()
-+log('fsck: par2 support intentionally disabled: see README.Fedora.\n')
-+opt.disable_par2 = True
-+
- if opt.par2_ok:
-     if par2_ok:
-         sys.exit(0)  # 'true' in sh
--- 
-2.1.0
-

diff --git a/0006-Disable-test_from_path_error-test-that-fails-on-Fedo.patch b/0006-Disable-test_from_path_error-test-that-fails-on-Fedo.patch
deleted file mode 100644
index adfcf48..0000000
--- a/0006-Disable-test_from_path_error-test-that-fails-on-Fedo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f82ebbebd0a46f1afe62c373b3a2f927f1cda366 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
-Date: Wed, 14 Oct 2015 17:49:44 +0200
-Subject: [PATCH 6/6] Disable test_from_path_error() test that fails on Fedora
- Koji/COPR.
-
----
- lib/bup/t/tmetadata.py | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py
-index 126e1d7..14827ee 100644
---- a/lib/bup/t/tmetadata.py
-+++ b/lib/bup/t/tmetadata.py
-@@ -158,27 +158,27 @@ def _first_err():
-     return ''
- 
- 
--@wvtest
--def test_from_path_error():
--    initial_failures = wvfailure_count()
--    if is_superuser() or detect_fakeroot():
--        return
--    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
--    path = tmpdir + '/foo'
--    os.mkdir(path)
--    m = metadata.from_path(path, archive_path=path, save_symlinks=True)
--    WVPASSEQ(m.path, path)
--    os.chmod(path, 000)
--    metadata.from_path(path, archive_path=path, save_symlinks=True)
--    if metadata.get_linux_file_attr:
--        print >> sys.stderr, 'saved_errors:', helpers.saved_errors
--        WVPASS(len(helpers.saved_errors) == 1)
--        errmsg = _first_err()
--        WVPASS(errmsg.startswith('read Linux attr'))
--        clear_errors()
--    if wvfailure_count() == initial_failures:
--        subprocess.call(['chmod', '-R', 'u+rwX', tmpdir])
--        subprocess.call(['rm', '-rf', tmpdir])
-+#@wvtest
-+#def test_from_path_error():
-+#    initial_failures = wvfailure_count()
-+#    if is_superuser() or detect_fakeroot():
-+#        return
-+#    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
-+#    path = tmpdir + '/foo'
-+#    os.mkdir(path)
-+#    m = metadata.from_path(path, archive_path=path, save_symlinks=True)
-+#    WVPASSEQ(m.path, path)
-+#    os.chmod(path, 000)
-+#    metadata.from_path(path, archive_path=path, save_symlinks=True)
-+#    if metadata.get_linux_file_attr:
-+#        print >> sys.stderr, 'saved_errors:', helpers.saved_errors
-+#        WVPASS(len(helpers.saved_errors) == 1)
-+#        errmsg = _first_err()
-+#        WVPASS(errmsg.startswith('read Linux attr'))
-+#        clear_errors()
-+#    if wvfailure_count() == initial_failures:
-+#        subprocess.call(['chmod', '-R', 'u+rwX', tmpdir])
-+#        subprocess.call(['rm', '-rf', tmpdir])
- 
- 
- def _linux_attr_supported(path):
--- 
-2.1.0
-

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-10-30 14:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-30 14:54 [rpms/bup] f44: Dropped obsolete patches 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox