Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package/cleanup-list
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def parse_repo(dbpath: str) -> PKGS:

def get_orphans() -> set[str]:
base_url = "https://archlinux.org/packages/search/json/?maintainer=orphan"
query = "repo=Community&repo=Core&repo=Extra&repo=Multilib"
query = "repo=Core&repo=Extra&repo=Multilib"
response = requests.get(f"{base_url}&{query}").json()
num_pages = response["num_pages"]

Expand All @@ -114,10 +114,10 @@ def get_orphans() -> set[str]:
return {pkg["pkgname"] for pkg in results}


def get_packages(mirror="http://mirror.pkgbuild.com") -> PKGS:
def get_packages(mirror="https://mirror.pkgbuild.com") -> PKGS:
pkgs = {}
with tempfile.TemporaryDirectory() as tmpdir:
for repo in ("core", "extra", "community", "multilib"):
for repo in ("core", "extra", "multilib"):
url = f"{mirror}/{repo}/os/x86_64/{repo}.db"
response = requests.get(url)

Expand Down
7 changes: 1 addition & 6 deletions package/staging2testing
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ CMD = './db-move {} {} {}'

def main(url):
pkgs = set()
communitypkgs = set()
multilibpkgs = set()

try:
Expand All @@ -24,17 +23,13 @@ def main(url):
for pkg in r.json()['packages']:
pkgbase = pkg['pkgbase']

if pkg['repo'] == 'community':
communitypkgs.add(pkgbase)
elif pkg['repo'] == 'multilib':
if pkg['repo'] == 'multilib':
multilibpkgs.add(pkgbase)
else:
pkgs.add(pkgbase)

if pkgs:
print(CMD.format('staging', 'testing', ' '.join(pkgs)))
if communitypkgs:
print(CMD.format('community-staging', 'community-testing', ' '.join(communitypkgs)))
if multilibpkgs:
print(CMD.format('multilib-staging', 'multilib-testing', ' '.join(multilibpkgs)))

Expand Down
2 changes: 1 addition & 1 deletion security/repo-sec-checker
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ from tabulate import tabulate
ARCHS = ['x86_64']
PKG_EXT = '.tar.zst'
DEFAULT_SOURCE_DIR = '/srv/ftp'
SOURCE_WHITELIST = ['core', 'extra', 'community', 'multilib']
SOURCE_WHITELIST = ['core', 'extra', 'multilib']

# FORTIFY_SOURCE checklist
UNSAFE_FUNCTIONS = set([
Expand Down
Loading