- Aur-dev - lists.archlinux.org

[aur-dev] yaourt search filtering
by Jude DaShiell 09 Feb '15

09 Feb '15

Can something be put into a yaourt search such that outdated packages either are hidden or are shown under a group heading of outdated packages? jude <jdashiel(a)shellworld.net> Twitter: @JudeDaShiell

3 3

[aur-dev] [PATCH] Update .gitignore
by Lukas Fleischer 04 Feb '15

04 Feb '15

* Remove user-specific configuration. * Update with latest changes to the configuration file and templates. * Order entries alphabetically. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- .gitignore | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ed22497..590e1ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,8 @@ -.htaccess -robots.txt -*.swp -web/lib/config.inc -web/lib/config.inc.php -*.DS_Store -web/html/xml/*.xml +conf/config dummy-data.sql* -web/locale/*/ po/*.mo po/*.po~ po/POTFILES +scripts/git-integration/__pycache__/ +scripts/git-integration/templates/ +web/locale/*/ -- 2.2.2

1 0

[aur-dev] [PATCH/RFC] Rename the AUR software to aurweb
by Lukas Fleischer 04 Feb '15

04 Feb '15

Rename the project to help differentiate between the software providing access to the Arch User Repository and the collection of source packages itself. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- AUTHORS | 2 +- INSTALL | 4 +- README | 26 ++++++------ TRANSLATING | 32 +++++++-------- web/README | 104 ------------------------------------------------ web/html/css/aur.css | 74 ---------------------------------- web/html/css/aurweb.css | 75 ++++++++++++++++++++++++++++++++++ web/html/home.php | 4 +- web/html/index.php | 2 +- web/template/footer.php | 4 +- web/template/header.php | 2 +- 11 files changed, 113 insertions(+), 216 deletions(-) delete mode 100644 web/README delete mode 100644 web/html/css/aur.css create mode 100644 web/html/css/aurweb.css diff --git a/AUTHORS b/AUTHORS index 6581e81..582ccca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,7 +7,7 @@ Current Maintainers Contributors ------------ -Use `git shortlog -s` for a list of AUR contributors. +Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ diff --git a/INSTALL b/INSTALL index cbb9f44..62db77d 100644 --- a/INSTALL +++ b/INSTALL @@ -37,9 +37,9 @@ Setup on Arch Linux: Include conf/extra/httpd-vhosts.conf -4) Clone the AUR project (using the MYUSER from above) +4) Clone the aurweb project (using the MYUSER from above) $ cd - $ git clone git://projects.archlinux.org/aur.git + $ git clone git://projects.archlinux.org/aurweb.git 5) Configure PHP Make sure you have mysql and json enabled in PHP. diff --git a/README b/README index 6e7c414..fb3af67 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -Arch User Repository (AUR) -========================== +aurweb +====== -The Arch User Repository (AUR) is a framework for hosting a collection of -packaging scripts that are created and submitted by the Arch community. The -scripts contained in the repository (PKGBUILDs) can be built using makepkg and -installed via the Arch package manager pacman. The AUR project aims to provide -the necessary web interface, database schema, and scripts for a multi-lingual -community-driven repository. +aurweb is a framework for hosting the Arch User Repository (AUR), a collection +of packaging scripts that are created and submitted by the Arch Linux +community. The scripts contained in the repository (PKGBUILDs) can be built +using makepkg and installed via the Arch Linux package manager pacman. The +aurweb project aims to provide the necessary web interface, database schema, +and scripts for a multi-lingual community-driven repository. Functionality ------------- @@ -25,7 +25,7 @@ Directory Layout ---------------- po:: - Translation files for strings in the AUR web interface. + Translation files for strings in the aurweb interface. scripts:: aurblup package blacklist tool. Scripts for AUR maintenance. @@ -42,9 +42,9 @@ Links * The official repository is hosted at git://projects.archlinux.org/aur.git -- see HACKING for information on submitting patches. -* Discovered bugs can be submitted to the AUR bug tracker: +* Discovered bugs can be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 -* Questions, comments, and patches related to the AUR can be sent to the AUR - development mailing list: aur-dev(a)archlinux.org -- mailing list archives: - https://mailman.archlinux.org/mailman/listinfo/aur-dev +* Questions, comments, and patches related to aurweb can be sent to the aurweb + development mailing list: aurweb-dev(a)archlinux.org -- mailing list archives: + https://mailman.archlinux.org/mailman/listinfo/aurweb-dev diff --git a/TRANSLATING b/TRANSLATING index 27855f6..e450640 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -1,31 +1,31 @@ -AUR Translation -================ +aurweb Translation +================== -This document describes how to create and maintain AUR translations. It was -originally derived from https://wiki.archlinux.org/index.php/AUR_Translation +This document describes how to create and maintain aurweb translations. It was +originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation -Creating an AUR translation requires a Transifex (http://www.transifex.com/) -account. You will need to register with a translation team on the AUR project -page (http://www.transifex.com/projects/p/aur/) +Creating an aurweb translation requires a Transifex (http://www.transifex.com/) +account. You will need to register with a translation team on the aurweb +project page (http://www.transifex.com/projects/p/aurweb/) Creating a New Translation ---------------------------- +-------------------------- Before beginning, please sign up for an Transifex account and request the -addition of a new translation team for the AUR project. Also, please do not +addition of a new translation team for the aurweb project. Also, please do not translate if you are unwilling to maintain or find someone to maintain the -translation. This is due to the fact that the AUR is a rapidly evolving project +translation. This is due to the fact that aurweb is a rapidly evolving project and there are constantly new strings to be translated. If the translations get too out of sync with the released versions, there will be too many untranslated strings for the translation to be usable, and it may have to be disabled. -1. Check out the AUR source using git: +1. Check out the aurweb source using git: -$ git clone git://projects.archlinux.org/aur.git aur-git +$ git clone git://projects.archlinux.org/aurweb.git aurweb-git -2. Go into the "po/" directory in the AUR source and run msginit(1) to create a - initial translation file from our translation catalog: +2. Go into the "po/" directory in the aurweb source and run msginit(1) to + create a initial translation file from our translation catalog: $ cd aur-git $ git checkout master @@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot $ poedit <locale>.po -5. If you have a working AUR setup, add a line for the new translation in +5. If you have a working aurweb setup, add a line for the new translation in "web/lib/config.inc.php.proto" and test if everything looks right. 6. Upload the newly created ".po" file to Transifex. If you don't like the web @@ -45,7 +45,7 @@ $ poedit <locale>.po Updating an Existing Translation ---------------------------------- +-------------------------------- 1. Download current translation files from Transifex. You can also do this using transifex-client which is available through the AUR: diff --git a/web/README b/web/README deleted file mode 100644 index 96aade5..0000000 --- a/web/README +++ /dev/null @@ -1,104 +0,0 @@ -============== -AUR Web Interface -============== - -Terms and Definitions: -================ -AUR - Arch User Repository - Repository made up of a collection of build scripts that are - created and submitted by the Arch community. - -TU - Trusted User - A user that can add binary packages to the [community] - repository and administer AUR. - -[unsupported] - The collection of package build files hosted via the AUR website. - -File Hierachy -========= - -Directory Layout: -------------------- -./html - DocumentRoot for AUR, where the PHP scripts live. -./html/css - CSS for AUR appearance -./html/css/navbar - CSS for Arch navigation bar appearance -./html/images - Any AUR images live here. -./lib - Supporting PHP include files. Access denied to Apache. -./locale -./template - Where most of the html markup resides and minimal - amount of PHP scripting. -./template/stats - -./html Files: -------------- -account.php - - PHP script to handle registering for a new account. It prompts - the visitor for account information: desired username, E-mail, - password, real name, IRC nick, and default language. The info is - recorded in the Users table. - - A logged-in user can change any of their own account information. If a - TU or Developer is logged into the system, they can search for and - edit accounts. A TU can change an account to a TU or User account. A - Developer can also change an account to the Developer type. TUs and - Developers are able to suspend accounts. If an account is suspended, - all packages are orphaned (the MaintainerUID field in the Packages - table is set to NULL). - -addvote.php - - A form to submit proposals relating to the AUR. Only accessible to TUs - and Developers. Can be used to vote on a potential new TU, or any - other proposal that needs a vote. Length of the vote can be specified. - -index.php - - Main page for the AUR. Provides links to all other pages in the AUR. - Gives a brief synopsis of what the AUR is and where to go for more - information. - -logout.php - - Logs out a logged-in user. Clears the session id from the Sessions - table and unsets the cookie. - -packages.php - - Page used to search the package database. Supports searching by name, - category, maintainer, popularity, etc. Also provides the ability to go - to a package page which has specific information for that package. - A specific package page includes the name, description, votes, etc. - As well as the ability to perform actions on the packages, such as - flagging or leaving a comment on the package. - -passreset.php - - A page for a user to enter their e-mail and receive a reset e-mail to - replace the forgotten password. - -pkgsubmit.php - - Page for users to upload a new package. Only allows upload of a - tarball that has been compressed with gzip. Tarball must contain the - PKGBUILD, scriptlets, and any other files necessary to build the - package from source. The user can select a category for the package. - The page makes appropriate entries into the database for tracking the - newly added source package and associated information. - -rpc.php - - A frontend for tools to obtain raw information from the AUR. Features - the ability to search for a package, return information on a package, - return information on multiple packages, and search for a specific - package maintainer. Functionality through HTTP GET. - -rss.php - - Generates RDF Site Summary (RSS) feed with the latest packages updated - in the AUR. Lists most recent 20 packages. Includes package name, link - to package page, package description, time of update, source listing, - maintainer name. - -tu.php - - Page only available to TUs and Developers. Shows ongoing votes for - proposals and past votes for proposals. Current votes can be voted on - with a "Yes" vote, "No" vote, or an "Abstain" vote. Developers and TUs - can only vote once. Cannot vote on a proposal about themselves. - -voters.php - - Page only available to TUs and Developers. Shows list of users that - voted for a specific package. Each username links to the user's - account information page. diff --git a/web/html/css/aur.css b/web/html/css/aur.css deleted file mode 100644 index 654116a..0000000 --- a/web/html/css/aur.css +++ /dev/null @@ -1,74 +0,0 @@ -/* AUR-specific customizations to "archweb.css". */ -#archnavbar.anb-aur ul li#anb-aur a { - color: white !important; -} - -#lang_sub { - float: right; -} - -.pkglist-nav .page { - margin: 0 .25em; -} - -#pkg-updates td.pkg-new { - padding: 0 .5em; -} - -#pkg-stats td.stat-desc { - white-space: normal; -} - -#actionlist form { - margin: 0; - padding: 0; -} - -.arch-bio-entry ul { - list-style: none; - padding: 0; -} - -#pkg-updates table { - table-layout: fixed; - width:100%; -} - -#pkg-updates td.pkg-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -#pkg-updates td.pkg-new { - width: 16px; -} - -#pkg-updates td.pkg-date { - text-align:right; -} - -.text-button { - background: transparent; - border: none !important; - margin: 0 !important; - padding: 0 !important; - font: normal 100% sans-serif; - text-decoration: none; - color: #07b; - cursor: pointer; -} - -.text-button:hover { - text-decoration: underline; - color: #666; -} - -.text-button::-moz-focus-inner { - padding: 0; - border: none; -} - -.comment-deleted { - color: #999; -} diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css new file mode 100644 index 0000000..551b3c7 --- /dev/null +++ b/web/html/css/aurweb.css @@ -0,0 +1,75 @@ +/* aurweb-specific customizations to archweb.css */ + +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + +#lang_sub { + float: right; +} + +.pkglist-nav .page { + margin: 0 .25em; +} + +#pkg-updates td.pkg-new { + padding: 0 .5em; +} + +#pkg-stats td.stat-desc { + white-space: normal; +} + +#actionlist form { + margin: 0; + padding: 0; +} + +.arch-bio-entry ul { + list-style: none; + padding: 0; +} + +#pkg-updates table { + table-layout: fixed; + width:100%; +} + +#pkg-updates td.pkg-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#pkg-updates td.pkg-new { + width: 16px; +} + +#pkg-updates td.pkg-date { + text-align:right; +} + +.text-button { + background: transparent; + border: none !important; + margin: 0 !important; + padding: 0 !important; + font: normal 100% sans-serif; + text-decoration: none; + color: #07b; + cursor: pointer; +} + +.text-button:hover { + text-decoration: underline; + color: #666; +} + +.text-button::-moz-focus-inner { + padding: 0; + border: none; +} + +.comment-deleted { + color: #999; +} diff --git a/web/html/home.php b/web/html/home.php index 556e21b..e075bb3 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -45,12 +45,12 @@ html_header( __("Home") ); <p> <?php echo __( - 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR, use the %saur-dev%s mailing list.', + 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saurweb-dev%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', '<var>', '</var>', - '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aurweb-dev">', '</a>' ); ?> diff --git a/web/html/index.php b/web/html/index.php index 95989f5..3e499ef 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -140,7 +140,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } else { switch ($path) { case "/css/archweb.css": - case "/css/aur.css": + case "/css/aurweb.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); readfile("./$path"); diff --git a/web/template/footer.php b/web/template/footer.php index 806d3be..1b451b3 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,9 +3,9 @@ <div id="footer"> <?php if ($ver): ?> - <p>AUR <?= htmlspecialchars($ver) ?></p> + <p>aurweb <?= htmlspecialchars($ver) ?></p> <?php endif; ?> - <p>Copyright © 2004-<?= date("Y") ?> AUR Development Team.</p> + <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> diff --git a/web/template/header.php b/web/template/header.php index 6167fb7..8fa44f1 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -6,7 +6,7 @@ <head> <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title> <link rel='stylesheet' type='text/css' href='/css/archweb.css' /> - <link rel='stylesheet' type='text/css' href='/css/aur.css' /> + <link rel='stylesheet' type='text/css' href='/css/aurweb.css' /> <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -- 2.2.2

1 1

[aur-dev] Renaming the AUR
by Lukas Fleischer 30 Jan '15

30 Jan '15

Hi, Currently, we use the term "AUR" for both the collection of user-supplied source packages and the software that helps with accessing and modifying these packages which causes quite some misunderstandings. Earlier, it was suggested to use "[unsupported]" for the collection of packages and "AUR" for the software but I don't really like that terminology (makes the source package repository look like a repository of binary packages and calls the software "repository"). Here is what I suggest: Keep using the term "AUR" for the collection of packages and rename the software to "aurweb" (borrowing from archweb). What would need to be changed: * The name of the aur.git repository would become aurweb.git. * Several references in the AUR(web) source code need to be fixed, the header will still refer to the Arch User Repository. * Some uses of "AUR" in the Arch wiki need to be brought in line with the new terminology. Any other suggestions for a name? Is there anything I missed? I already changed the name of the AUR project to "AUR web interface" on Flyspray. Maybe that helps with reducing the number of AUR package bug reports in the tracker. Regards, Lukas

3 3

[aur-dev] [PATCH] AUTHORS: Add past maintainers
by Lukas Fleischer 19 Jan '15

19 Jan '15

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- AUTHORS | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6581e81..1958ca0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,19 @@ Current Maintainers ------------------- -* canyonknight <canyonknight(a)gmail.com> * Lukas Fleischer (cryptocrack) <archlinux(a)cryptocrack.de> +Past Maintainers +---------------- + +* canyonknight <canyonknight(a)gmail.com> (2013-2014) +* Loui Chang <louipc.ist(a)gmail.com> (2008-2011) +* Callan Barrett <wizzomafizzo(a)gmail.com> (2008-2009) +* eliott <eliott(a)cactuswax.net> (2007-2009) +* Paul Mattal <paul(a)mattal.com> (2007) +* Simo Leone <simo(a)archlinux.org> (2005-2008) +* Eric (2004-2005) + Contributors ------------ -- 2.2.2

1 1

[aur-dev] [PATCH] git-update.py: Check for mandatory fields
by Lukas Fleischer 15 Jan '15

15 Jan '15

Check explicitly whether pkgver, pkgrel, pkgname, pkgdesc and url are available in each package. If any of these is missing, an exception might occur when parsing the meta data later. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-update.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py index 3d2742a..161d42f 100755 --- a/scripts/git-integration/git-update.py +++ b/scripts/git-integration/git-update.py @@ -212,6 +212,10 @@ for commit in walker: for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) + for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc', 'url'): + if not field in pkginfo: + die_commit('missing mandatory field: %s' % (field), commit.id) + if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit(): die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id) -- 2.2.2

1 0

[aur-dev] AUR 4.0.0 version tags
by Yaron de Leeuw 13 Jan '15

13 Jan '15

Hi. I have a suggestion for AUR 4.0.0: git tags with version information. The idea is that each and every commit will be tagged with the version extracted from .SRCINFO. Only the server will be allowed to apply tags (maybe a simple chmod on `.git/ref/tags` would do). They must never be overwritten, so `git-serve.py` should check if a tag exists before accepting a new commit. This will allow the user to check what happened to the AUR package he wants to install with`git diff` and `git log`, relative to his installed version. It will totally replace the need of aurifere, and can help other AUR helpers [1] as well. What do you think? If there is interest, I will work on a patch. Yaron [1] https://github.com/rmarquis/pacaur/issues/231

3 3

[aur-dev] [PATCH] Use custom templates for Git repositories
by Lukas Fleischer 12 Jan '15

12 Jan '15

Do not waste disk space by copying dozens of unneeded sample hooks. Use a custom template directory that only includes the git-update hook. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- INSTALL | 12 ++++++++---- conf/config.proto | 1 + scripts/git-integration/gen-templates.py | 29 +++++++++++++++++++++++++++++ scripts/git-integration/git-serve.py | 5 ++--- scripts/git-integration/init-repos.py | 5 ++--- 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100755 scripts/git-integration/gen-templates.py diff --git a/INSTALL b/INSTALL index 2368db1..7b90ffd 100644 --- a/INSTALL +++ b/INSTALL @@ -19,7 +19,11 @@ Setup on Arch Linux $ mysql -uaur -p AUR </srv/http/aur/schema/aur-schema.sql -5) Clone the OpenSSH project, apply the AUR sshd patch and run `make`: +5) Generate templates for new Git repositories: + + $ /srv/http/aur/scripts/git-integration/gen-templates.py + +6) Clone the OpenSSH project, apply the AUR sshd patch and run `make`: $ cd /srv/http/aur/ $ git clone git://anongit.mindrot.org/openssh.git @@ -30,7 +34,7 @@ Setup on Arch Linux $ ./configure $ make -6) Create and edit the sshd configuration: +7) Create and edit the sshd configuration: $ cd /srv/http/aur/ $ umask 077 @@ -38,12 +42,12 @@ Setup on Arch Linux $ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa $ cp scripts/git-integration/sshd_config .ssh/ -7) Create a new user and change ownership of the .ssh directory: +8) Create a new user and change ownership of the .ssh directory: # useradd -U -d /srv/http/aur -c 'AUR user' aur # chown aur:aur /srv/http/aur/.ssh/ -8) Add, enable and start systemd unit files for the new sshd: +9) Add, enable and start systemd unit files for the new sshd: # cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/ # cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/ diff --git a/conf/config.proto b/conf/config.proto index a3b1640..ac79bd6 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -35,6 +35,7 @@ ssh-options = no-port-forwarding,no-X11-forwarding,no-pty [serve] repo-base = /srv/http/aur/repos/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ +template-path = /srv/http/aur/scripts/git-integration/templates/ git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell ssh-cmdline = ssh -p 2222 aur(a)aur.archlinux.org diff --git a/scripts/git-integration/gen-templates.py b/scripts/git-integration/gen-templates.py new file mode 100755 index 0000000..e451b53 --- /dev/null +++ b/scripts/git-integration/gen-templates.py @@ -0,0 +1,29 @@ +#!/usr/bin/python3 + +import configparser +import os +import shutil +import sys + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config") + +template_path = config.get('serve', 'template-path') +git_update_hook = config.get('serve', 'git-update-hook') + +def die(msg): + sys.stderr.write("%s\n" % (msg)) + exit(1) + +if os.path.exists(template_path): + shutil.rmtree(template_path) + +os.mkdir(template_path) +os.chdir(template_path) +os.mkdir("branches") +os.mkdir("hooks") +os.mkdir("info") +os.symlink(git_update_hook, template_path + 'hooks/update') + +with open("description", 'w') as f: + f.write("Unnamed repository; push to update the description.\n") diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 6f4d4f9..de9cb59 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -19,9 +19,9 @@ aur_db_socket = config.get('database', 'socket') repo_base_path = config.get('serve', 'repo-base') repo_regex = config.get('serve', 'repo-regex') -git_update_hook = config.get('serve', 'git-update-hook') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') +template_path = config.get('serve', 'template-path') def repo_path_validate(path): if not path.startswith(repo_base_path): @@ -87,8 +87,7 @@ def setup_repo(repo, user): db.close() repo_path = repo_base_path + '/' + repo + '.git/' - pygit2.init_repository(repo_path, True) - os.symlink(git_update_hook, repo_path + 'hooks/update') + pygit2.init_repository(repo_path, True, 48, template_path=template_path) def check_permissions(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, diff --git a/scripts/git-integration/init-repos.py b/scripts/git-integration/init-repos.py index 62c51b1..5c4fcfe 100755 --- a/scripts/git-integration/init-repos.py +++ b/scripts/git-integration/init-repos.py @@ -19,7 +19,7 @@ aur_db_socket = config.get('database', 'socket') repo_base_path = config.get('serve', 'repo-base') repo_regex = config.get('serve', 'repo-regex') -git_update_hook = config.get('serve', 'git-update-hook') +template_path = config.get('serve', 'template-path') def die(msg): sys.stderr.write("%s\n" % (msg)) @@ -45,7 +45,6 @@ for repo in repos: print("[%s/%d] %s" % (str(i).rjust(len(str(n))), n, repo)) repo_path = repo_base_path + '/' + repo + '.git/' - pygit2.init_repository(repo_path, True) - os.symlink(git_update_hook, repo_path + 'hooks/update') + pygit2.init_repository(repo_path, True, 48, template_path=template_path) i += 1 -- 2.2.1

1 0

[aur-dev] [PATCH] Add to notification list on repository creation
by Lukas Fleischer 11 Jan '15

11 Jan '15

Since commit bf7717a (git-serve.py: Adopt repositories on creation, 2015-01-06), newly created package bases are no longer orphan and therefore, they are not adopted when pushing the first commit which also means that the initial submitter is not added to the notification list automatically. To remedy this, add the owner to the notification list when setting up a new repository. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 227e37b..6f4d4f9 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -78,6 +78,10 @@ def setup_repo(repo, user): cur.execute("INSERT INTO PackageBases (Name, SubmittedTS, ModifiedTS, " + "SubmitterUID, MaintainerUID) VALUES (%s, UNIX_TIMESTAMP(), " + "UNIX_TIMESTAMP(), %s, %s)", [repo, userid, userid]) + pkgbase_id = cur.lastrowid + + cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + + "VALUES (%s, %s)", [pkgbase_id, userid]) db.commit() db.close() -- 2.2.1

1 0

[aur-dev] [PATCH] Link to the cgit log from package details
by Lukas Fleischer 09 Jan '15

09 Jan '15

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_details.php | 5 ++++- web/template/pkgbase_details.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 52afba2..c1c07ba 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -81,7 +81,10 @@ $sources = pkg_sources($row["ID"]); <div id="actionlist"> <h4><?= __('Package Actions') ?></h4> <ul class="small"> - <li><a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> + <li> + <a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + </li> <li><a href="<?= $cgit_uri . $row['BaseName'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index ae363fd..98a7219 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -32,7 +32,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <div id="actionlist"> <h4><?= __('Package Actions') ?></h4> <ul class="small"> - <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a></li> + <li> + <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + </li> <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> -- 2.2.1

1 0