X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=64b5b8ddeb69999a0fe1db2f80a1c77cd4458a33;hb=9a1cfa782b2147f017debea6819d71707ff5ab7d;hp=a8107113ecd54257ec7a72f922fe8828d8e6f7a5;hpb=5ae0dac7c89af97eab8ba4fb34e1099a3b9dddc7;p=dak.git

diff --git a/daklib/regexes.py b/daklib/regexes.py
index a8107113..64b5b8dd 100644
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -34,8 +34,6 @@ re_isanum = re.compile (r"^\d+$")
 
 #: Looking for the default reply
 re_default_answer = re.compile(r"\[(.*)\]")
-#: Used in build_summaries to make changes output look better
-re_fdnic = re.compile(r"\n\n")
 #: Detect a binnmu
 re_bin_only_nmu = re.compile(r"\+b\d+$")
 
@@ -51,17 +49,14 @@ re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$")
 
 orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2|xz)"
 re_orig_source_ext = re.compile(orig_source_ext_re + "$")
-re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc)$")
+re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc|asc)$")
 re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern)
-re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2|xz)$")
-#re_is_orig_source = re.compile (r"(.+)_(.+?)\.(?:orig\.)?tar\.(?:gz|bz2)$")
 
 re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)")
 re_multi_line_field = re.compile(r"^\s(.*)")
 re_taint_free = re.compile(r"^[-+~/\.\w]+$")
 
 re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>")
-re_gpg_uid = re.compile('^uid.*<([^>]*)>')
 
 re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$")
 re_verwithext = re.compile(r"^(\d+)(?:\.(\d+))(?:\s+\((\S+)\))?$")
@@ -90,10 +85,6 @@ re_spacestrip = re.compile('(\s)')
 # From import_archive.py
 re_arch_from_filename = re.compile(r"binary-[^/]+")
 
-# From import_ldap_fingerprints.py
-re_gpg_fingerprint = re.compile(r"^\s+Key fingerprint = (.*)$", re.MULTILINE)
-re_debian_address = re.compile(r"^.*<(.*)@debian\.org>$", re.MULTILINE)
-
 # From new_security_install.py
 re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$")
 
@@ -127,7 +118,7 @@ re_match_expired = re.compile(r"^The key used to sign .+ has expired on .+$")
 
 # in generate-releases
 re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$")
-re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2)?|Sources(.gz|.bz2)?|MD5SUMS|SHA256SUMS|Release)$")
+re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2|.xz)?|Sources(.gz|.bz2|.xz)?|MD5SUMS|SHA256SUMS|Release)$")
 
 # in generate_index_diffs
 re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")
@@ -138,10 +129,13 @@ re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")
 ######################################################################
 
 # Match safe filenames
-re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.:~+-]*$')
+re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.~+-]*$')
+
+# Match safe filenames, including slashes
+re_file_safe_slash = re.compile(r'^[a-zA-Z0-9][/a-zA-Z0-9_.~+-]*$')
 
 # Prefix of binary and source filenames
-_re_file_prefix = r'^(?P<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.:~+-]+?)'
+_re_file_prefix = r'^(?P<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.~+-]+?)'
 
 # Match binary packages
 # Groups: package, version, architecture, type