Commit graph

195 commits

Author SHA1 Message Date
wiz
1456b5cef1 ikiwiki: only allow Python 3 2023-05-02 16:22:14 +00:00
schmonz
3a33fdf7bb For convenience, add a 'mercurial' option (off by default) to bring in py-mercurial. 2023-05-02 00:43:54 +00:00
nia
04f4eef997 *: Revbump packages that use Python at runtime without a PKGNAME prefix 2022-06-30 11:18:01 +00:00
wiz
8292204475 *: recursive bump for perl 5.36 2022-06-28 11:30:51 +00:00
wiz
e032d93683 kiwiki: add option for choosing markdown backend
From Vladimir Stupin in PR 56602.
2022-01-03 16:58:40 +00:00
schmonz
e36fa7fee3 For paths that are configurable, default to pkgsrc-compatible values.
Bump PKGREVISION.
2021-11-02 09:44:48 +00:00
nia
0a4acf7fe3 www: Replace RMD160 checksums with BLAKE2s checksums
All checksums have been double-checked against existing RMD160 and
SHA512 hashes

Not committed (merge conflicts):
www/nghttp2/distinfo

Unfetchable distfiles (almost certainly fetched conditionally...):
./www/nginx-devel/distinfo array-var-nginx-module-0.05.tar.gz
./www/nginx-devel/distinfo echo-nginx-module-0.62.tar.gz
./www/nginx-devel/distinfo encrypted-session-nginx-module-0.08.tar.gz
./www/nginx-devel/distinfo form-input-nginx-module-0.12.tar.gz
./www/nginx-devel/distinfo headers-more-nginx-module-0.33.tar.gz
./www/nginx-devel/distinfo lua-nginx-module-0.10.19.tar.gz
./www/nginx-devel/distinfo naxsi-1.3.tar.gz
./www/nginx-devel/distinfo nginx-dav-ext-module-3.0.0.tar.gz
./www/nginx-devel/distinfo nginx-rtmp-module-1.2.2.tar.gz
./www/nginx-devel/distinfo nginx_http_push_module-1.2.10.tar.gz
./www/nginx-devel/distinfo ngx_cache_purge-2.5.1.tar.gz
./www/nginx-devel/distinfo ngx_devel_kit-0.3.1.tar.gz
./www/nginx-devel/distinfo ngx_http_geoip2_module-3.3.tar.gz
./www/nginx-devel/distinfo njs-0.5.0.tar.gz
./www/nginx-devel/distinfo set-misc-nginx-module-0.32.tar.gz
./www/nginx/distinfo array-var-nginx-module-0.05.tar.gz
./www/nginx/distinfo echo-nginx-module-0.62.tar.gz
./www/nginx/distinfo encrypted-session-nginx-module-0.08.tar.gz
./www/nginx/distinfo form-input-nginx-module-0.12.tar.gz
./www/nginx/distinfo headers-more-nginx-module-0.33.tar.gz
./www/nginx/distinfo lua-nginx-module-0.10.19.tar.gz
./www/nginx/distinfo naxsi-1.3.tar.gz
./www/nginx/distinfo nginx-dav-ext-module-3.0.0.tar.gz
./www/nginx/distinfo nginx-rtmp-module-1.2.2.tar.gz
./www/nginx/distinfo nginx_http_push_module-1.2.10.tar.gz
./www/nginx/distinfo ngx_cache_purge-2.5.1.tar.gz
./www/nginx/distinfo ngx_devel_kit-0.3.1.tar.gz
./www/nginx/distinfo ngx_http_geoip2_module-3.3.tar.gz
./www/nginx/distinfo njs-0.5.0.tar.gz
./www/nginx/distinfo set-misc-nginx-module-0.32.tar.gz
2021-10-26 11:29:14 +00:00
nia
973412e332 www: Remove SHA1 hashes for distfiles 2021-10-07 15:06:57 +00:00
wiz
6eae1297d5 *: recursive bump for perl 5.34 2021-05-24 19:49:01 +00:00
schmonz
edc32dcd6b Apply upstream patch to catch up to highlight 4.0 API change. Bump
PKGREVISION.
2021-05-14 06:50:16 +00:00
nia
f6dd9d2f87 Revbump packages with a runtime Python dep but no version prefix.
For the Python 3.8 default switch.
2020-12-04 20:44:57 +00:00
wiz
6a4fe2ad96 *: comment out p5-DB_File dependency, part of perl 2020-09-01 08:04:22 +00:00
wiz
00da7815c0 *: bump PKGREVISION for perl-5.32. 2020-08-31 18:06:29 +00:00
schmonz
22e55709e1 Fix WRKSRC (no WikiCase needed with this tarball). 2020-02-15 15:22:21 +00:00
schmonz
6a66e46f5e Update to 3.20200202.3. From the changelog:
* highlight: Adapt to API change in highlight >= 3.51
* mdwn: Fix inverted footnote configuration when MultiMarkdown is
  enabled. Thanks, Giuseppe Bilotta
* Updated German basewiki and directives translation from Sebastian Kuhnert.
* Updated German program translation from Sebastian Kuhnert.

pkgsrc changes:

- Add 'ikiwiki-sudo' option for portable ikiwiki-mass-rebuild, on by default
2020-02-13 19:03:57 +00:00
rillig
b12904483c www: align variable assignments
pkglint -Wall -F --only aligned --only indent -r

Manually excluded phraseanet since pkglint got the indentation wrong.
2019-11-04 22:09:50 +00:00
schmonz
5fd0dcf373 Replace unportable su(1) usage with sudo(8). Fix a few perl paths broken
in previous. Bump PKGREVISION.
2019-09-01 02:19:37 +00:00
schmonz
c06f1e087b Avoid rebuilding everything on install. Respect PKG_SYSCONFDIR correctly
in ikiwiki-mass-rebuild. Bump PKGREVISION.
2019-08-31 21:32:13 +00:00
schmonz
b06f4437f1 Avoid -regex, not available in OpenBSD find(1). 2019-08-31 20:19:23 +00:00
wiz
84e123ddd2 Bump PKGREVISIONs for perl 5.30.0 2019-08-11 13:17:48 +00:00
schmonz
211e4423a7 As of 3.51, searchFile() is no longer provided in highlight's Perl
bindings (at least on NetBSD and OS X, as built from pkgsrc). This
leaves us falling through to getConfDir(), which has been gone
rather longer.

From highlight git, it appears searchFile() and getFiletypesConfPath()
both originated in the 3.14 release. The latter is still available in
3.51, and returns the same result searchFile() used to. Switch to it.

(From upstream git 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce.)

Bump PKGREVISION.
2019-05-27 03:53:31 +00:00
leot
d277e4caf3 ikiwiki: Add DESTDIR support to the w3m option 2019-05-04 09:32:29 +00:00
maya
f34a8c24a3 PKGREVISION bump for anything using python without a PYPKGPREFIX.
This is a semi-manual PKGREVISION bump.
2019-04-25 07:32:34 +00:00
schmonz
51b28d1d38 Add dependency on p5-LWPx-ParanoidAgent. Ride recent version bump. 2019-02-28 22:20:01 +00:00
schmonz
3bfdd54f74 Update to ikiwiki. From the changelog:
* aggregate: Use LWPx::ParanoidAgent if available.
  Previously blogspam, openid and pinger used this module if available,
  but aggregate did not. This prevents server-side request forgery or
  local file disclosure, and mitigates denial of service when slow
  "tarpit" URLs are accessed.
  (CVE-2019-9187)
* blogspam, openid, pinger: Use a HTTP proxy if configured, even if
  LWPx::ParanoidAgent is installed.
  Previously, only aggregate would obey proxy configuration. If a proxy
  is used, the proxy (not ikiwiki) is responsible for preventing attacks
  like CVE-2019-9187.
* aggregate, blogspam, openid, pinger: Do not access non-http, non-https
  URLs.
  Previously, these plugins would have allowed non-HTTP-based requests if
  LWPx::ParanoidAgent was not installed. Preventing file URIs avoids local
  file disclosure, and preventing other rarely-used URI schemes like
  gopher mitigates request forgery attacks.
* aggregate, openid, pinger: Document LWPx::ParanoidAgent as strongly
  recommended.
  These plugins can request attacker-controlled URLs in some site
  configurations.
* blogspam: Document LWPx::ParanoidAgent as desirable.
  This plugin doesn't request attacker-controlled URLs, so it's
  non-critical here.
* blogspam, openid, pinger: Consistently use cookiejar if configured.
  Previously, these plugins would only obey this configuration if
  LWPx::ParanoidAgent was not installed, but this appears to have been
  unintended.
* po: Always filter .po files.
  The po plugin in previous ikiwiki releases made the second and
  subsequent filter call per (page, destpage) pair into a no-op,
  apparently in an attempt to prevent *recursive* filtering (which as
  far as we can tell can't happen anyway), with the undesired effect
  of interpreting the raw .po file as page content (e.g. Markdown)
  if it was inlined into the same page twice, which is apparently
  something that tails.org does. Simplify this by deleting the code
  that prevented repeated filtering. Thanks, intrigeri
  (Closes: #911356)
2019-02-28 22:00:48 +00:00
schmonz
6643337b33 Update to 3.20190207. From the changelog:
* graph: Add an optional "file" parameter
* emailauth: When email can't be sent, show the error message
* osm: Don't raise errors if tags don't have attached icons
* cgi: Avoid C compiler warnings for waitpid() on NetBSD
* Hide popup template content from documentation (Closes: #898836)
* meta: Make [[!meta date]] show an error if dates are invalid or
  Date::Parse can't be loaded
* inline: Cope with non-ASCII `rootpage` parameter.
  Thanks, Feng Shu
* table: Cope with non-ASCII content in CSV format tables.
  Thanks, Feng Shu
* trail: Allow unescaped punctuation in `pagenames` parameter
* comments: Hide "add comment" link from print stylesheet.
  Thanks, Antoine Beaupré
* recentchangesdiff, relativedate, toggle:
  Import JavaScript at the end of the page content, not the beginning,
  so that the browser can render content as soon as possible.
  Thanks, Antoine Beaupré
* inline: Add basic test coverage for [[!inline rootpage]]
* table: Add basic test coverage
* po: Add enough test coverage to reproduce Debian #911356
* comments: Improve test coverage
* tests: Exercise Unicode more
* aggregate: Fix aggregation of posts without a title.
  Thanks, Alexandre Oliva
* poll: Added postlink and posttrail options for better multi-page polls.
* Fix permalink to comments.
2019-02-07 15:47:32 +00:00
schmonz
948a285e4c Add upstream patch to give graph an optional "file" param, like table's.
Bump PKGREVISION.
2018-10-22 04:33:25 +00:00
schmonz
33856643a7 Need <sys/wait.h> for waitpid (NetBSD 8 warns). Apply upstream patch.
Bump PKGREVISION.
2018-08-29 08:03:37 +00:00
wiz
93b46879c7 Recursive bump for perl5-5.28.0 2018-08-22 09:43:40 +00:00
schmonz
dd902bd620 Attempt to make su(1) usage more portable. Remove very old text from
MESSAGE. Bump PKGREVISION.
2018-03-22 17:08:31 +00:00
schmonz
38a4d7fdc2 Update to 3.20180311. From the changelog:
[ Amitai Schleier ]
  * Avoid unexpected full paths from find(1)

  [ thm.id.fedoraproject.org ]
  * rst test: Probe for docutils Python 3 module, not Python 2

  [ Simon McVittie ]
  * mdwn: Automatically detect which Discount flags to use, fixing
    regressions in 3.20180228 when using Discount < 2.2
  * Add a test asserting that no plugin is an empty file, to confirm
    that the build fixes in 3.20180228 were successful
2018-03-11 22:57:55 +00:00
schmonz
e05a522856 Apply upstream patch to fix regression with older libdiscount where
Markdown links were no longer rendered as links. Bump PKGREVISION.
2018-03-09 16:12:50 +00:00
schmonz
37e606aa89 Fix build on systems without a /usr/bin/perl. 2018-03-04 17:40:28 +00:00
schmonz
34fbffb6aa Add patches missed in previous commit. 2018-03-02 19:22:24 +00:00
schmonz
868abd39bf Update to 3.20180228. From the changelog:
* core: Don't send relative redirect URLs when behind a reverse proxy
* core: Escape backticks etc. in directive error messages as HTML
  entities so that the error message is not subsequently parsed as
  Markdown
* mdwn: Enable fenced code blocks, PHP Markdown Extra-style definition
  lists and GitHub-style extensions to HTML tag syntax when used with
  Discount >= 2.2.0 (Closes: #[888055])
* img: Fix auto-detection of image format (if enabled, which is
  strongly discouraged) with ImageMagick >= 6.9.8-3
* rst: Use Python 3 instead of Python 2
* build: `set -e` before each `for` loop, so that errors are reliably
  trapped
* build: Use if/then instead of `||` so that the `-e` flag works
* build: Ensure that pm_to_blib finishes before rewriting shebang lines
* t: Make the img test pass with ImageMagick >= 6.9.8-3
  (Closes: #[891647])
* debian: Remove unused Lintian overrides for duplicate word false positives
* debian: Declare compliance with Debian Policy 4.1.3
2018-03-02 19:20:20 +00:00
schmonz
7471060223 Update to 3.20180105. From the changelog:
- emailauth: Fix cookie problem when user is on https and the cgiurl
  uses http, by making the emailed login link use https.
- passwordauth: Use https for emailed password reset link when user
  is on https.
- Remove openid provider icons from login selector, since openid
  providers are increasingly not working. Verisign retired theirs, and
  aol and yahoo/flickr are not commonly used for openid. Any users who
  still clicked those icons to login will need to instead enter their
  openid url.
- Updated German basewiki and directives translation from
  Sebastian Kuhnert.
2018-01-08 14:04:18 +00:00
rillig
b381c6e2f3 Sort PLIST files.
Unsorted entries in PLIST files have generated a pkglint warning for at
least 12 years. Somewhat more recently, pkglint has learned to sort
PLIST files automatically. Since pkglint 5.4.23, the sorting is only
done in obvious, simple cases. These have been applied by running:

  pkglint -Cnone,PLIST -Wnone,plist-sort -r -F
2018-01-01 22:29:15 +00:00
schmonz
4234f0fcdc Update to 3.20171001. From the changelog:
[ Joey Hess ]
* htmlscrubber: Add support for the video tag's loop and muted
  attributes. Those were not in the original html5 spec, but have been
  added in the whatwg html living standard and have wide browser support.
* emailauth, passwordauth: Avoid leaving cgisess_* files in the
  system temp directory.

[ Simon McVittie ]
* core: Don't decode the result of strftime if it is already tagged as
  UTF-8, as it might be since Perl >= 5.21.1. (Closes: #869240)
* img: Strip metadata from resized images when the deterministic config
  option is set. Thanks, intrigeri
* receive: Avoid asprintf() in IkiWiki::Receive, to avoid implicit
  declaration, potential misbehaviour on 64-bit platforms, and lack
  of portability to non-GNU platforms
* t: Add a regression test for untrusted git push
* receive: Fix untrusted git push with git (>= 2.11) by passing through
  the necessary environment variables to make the quarantine area work
* debian: Declare compliance with Debian Policy 4.1.1

[ Amitai Schleier ]
* l10n: Fix the build with po4a 0.52, by ensuring that msgstr ends
  with a newline if and only if msgid does
2017-10-02 03:27:29 +00:00
schmonz
82dbb9d930 Add upstream patch to fix build with po4a 0.52. 2017-09-20 02:57:31 +00:00
schmonz
43f9640017 Update to 3.20170622. From the changelog:
* t/git-cgi.t: Wait 1 second before doing a revert that should work.
  This hopefully fixes a race condition in which the test failed
  around 6% of the time. (Closes: 862494)
* Guard against set-but-empty REMOTE_USER CGI variable on
  misconfigured nginx servers, and in general treat sessions with
  a set-but-empty name as if they were not signed in.
* When the CGI fails, print the error to stderr, not "Died"
* mdwn: Don't mangle <style> into <elyts> under some circumstances
* mdwn: Enable footnotes by default when using the default Discount
  implementation. A new mdwn_footnotes option can be used to disable
  footnotes in MultiMarkdown and Discount.
* mdwn: Don't enable alphabetically labelled ordered lists by
  default when using the default Discount implementation. A new
  mdwn_alpha_list option can be used to restore the old
  interpretation.
* osm: Convert savestate hook into a changes hook. savestate is not
  the right place to write wiki content, and in particular this
  breaks websetup if osm's dependencies are not installed, even
  if the osm plugin is not actually enabled. (Closes: #719913)
* toc: if the heading is of the form <h1 id="...">, use that for
  the link in the table of contents (but continue to generate
  <a name="index42"></a> in case someone was relying on it)
* color: Do not leak markup into contexts that take only the plain
  text, such as toc
* meta: Document [[!meta name="foo" content="bar"]]
2017-06-24 13:10:44 +00:00
schmonz
d99062f1d5 Update to 3.20170111. From the changelog:
* passwordauth: prevent authentication bypass via multiple name
  parameters (CVE-2017-0356, OVE-20170111-0001)
* passwordauth: avoid userinfo forgery via repeated email parameter
  (also in the scope of CVE-2017-0356)
* CGI, attachment, passwordauth: harden against repeated parameters
  (not believed to have been a vulnerability)
* remove: make it clearer that repeated page parameter is OK here
* t/passwordauth.t: new automated test for passwordauth
2017-01-12 00:44:15 +00:00
schmonz
4f31330de2 Update to 3.20170110. From the changelog:
[ Amitai Schleier ]
* wrappers: Correctly escape quotes in git_wrapper_background_command

[ Simon McVittie ]
* git: use an explicit function parameter for the directory to work
  in. Previously, we used global state that was not restored correctly
  on catching exceptions, causing an unintended log message
  "cannot chdir to .../ikiwiki-temp-working: No such file or directory"
  with versions >= 3.20161229 when an attempt to revert a change fails
  or is disallowed
* git: don't run "git rev-list ... -- -- ..." which would select the
  wrong commits if a file named literally "--" is present in the
  repository
* check_canchange: log "bad file name whatever", not literal string
  "bad file name %s"
* t/git-cgi.t: fix a race condition that made the test fail
  intermittently
* t/git-cgi.t: be more careful to provide a syntactically valid
  author/committer name and email, hopefully fixing this test on
  ci.debian.net
* templates, comments, passwordauth: use rel=nofollow microformat
  for dynamic URLs
* templates: use rel=nofollow microformat for comment authors
* news: use Debian security tracker instead of MITRE for security
  references. Thanks, anarcat
* Set package format to 3.0 (native)
* d/copyright: re-order to put more specific stanzas later, to get the
  intended interpretation
* d/source/lintian-overrides: override obsolete-url-in-packaging for
  OpenID Selector, which does not seem to have any more current URL
  (and in any case our version is a fork)
* docwiki.setup: exclude TourBusStop from offline documentation.
  It does not make much sense there.
* d/ikiwiki.lintian-overrides: override script-not-executable warnings
* d/ikiwiki.lintian-overrides: silence false positive spelling warning
  for Moin Moin
* d/ikiwiki.doc-base: register the documentation with doc-base
* d/control: set libmagickcore-6.q16-3-extra as preferred
  build-dependency, with virtual package libmagickcore-extra as an
  alternative, to help autopkgtest to do the right thing
2017-01-11 02:15:54 +00:00
schmonz
04c2f6e616 Update to 3.20161229.1. From the changelog:
* git: Attribute reverts to the user doing the revert, not the wiki
  itself.
* git: Do not disable the commit hook while preparing a revert.
2016-12-30 13:59:42 +00:00
schmonz
886cb19c9a Update to 3.20161229. From the changelog:
* Security: force CGI::FormBuilder->field to scalar context where
  necessary, avoiding unintended function argument injection
  analogous to CVE-2014-1572. In ikiwiki this could be used to
  forge commit metadata, but thankfully nothing more serious.
  (CVE-2016-9646)
* Security: try revert operations in a temporary working tree before
  approving them. Previously, automatic rename detection could result in
  a revert writing outside the wiki srcdir or altering a file that the
  reverting user should not be able to alter, an authorization bypass.
  (CVE-2016-10026 represents the original vulnerability.)
  The incomplete fix released in 3.20161219 was not effective for git
  versions prior to 2.8.0rc0.
  (CVE-2016-9645 represents that incomplete solution.)
* Add CVE references for CVE-2016-10026
* Add automated test for using the CGI with git, including
  CVE-2016-10026
  - Build-depend on libipc-run-perl for better build-time test coverage
* Add missing ikiwiki.setup for the manual test for CVE-2016-10026
* git: don't issue a warning if the rcsinfo CGI parameter is undefined
* git: do not fail to commit changes with a recent git version
  and an anonymous committer
2016-12-30 03:21:11 +00:00
schmonz
2047906cb5 Update to 3.20161219. From the changelog:
[ Joey Hess ]
* inline: Prevent creating a file named ".mdwn" when the
  postform is submitted with an empty title.

[ Simon McVittie ]
* Security: tell `git revert` not to follow renames. If it does, then
  renaming a file can result in a revert writing outside the wiki srcdir
  or altering a file that the reverting user should not be able to alter,
  an authorization bypass. Thanks, intrigeri
* cgitemplate: remove some dead code. Thanks, blipvert
* Restrict CSS matches against header class to not break
  Pandoc tables with header rows. Thanks, karsk
* Make pagestats output more deterministic. Thanks, intrigeri
2016-12-21 00:52:59 +00:00
schmonz
91e9ca3718 Update to 3.20160905. From the changelog:
* [ Joey Hess ]
  * Fix installation when prefix includes a string metacharacter.
    Thanks, Sam Hathaway.
* [ Simon McVittie ]
  * Use git log --no-renames to generate recentchanges, fixing the git
    test-case with git 2.9 (Closes: #835612)
2016-09-14 18:04:09 +00:00
schmonz
925993592b Update to 3.20160728. From the changelog:
* Explicitly remove current working directory from Perl's library
  search path, mitigating CVE-2016-1238 (see #588017)
* wrappers: allocate new environment dynamically, so we won't overrun
  the array if third-party plugins add multiple environment variables.
* Standards-Version: 3.9.8 (no changes required)
2016-07-28 20:23:52 +00:00
wiz
73716d23de Bump PKGREVISION for perl-5.24.0 for everything mentioning perl. 2016-07-09 06:38:30 +00:00
schmonz
e0ac233644 Update to 3.20160509. From the changelog:
[ Amitai Schlair ]
  * img: ignore the case of the extension when detecting image format,
    fixing the regression that *.JPG etc. would not be displayed
    since 3.20160506

  [ Simon McVittie ]
  * img: parse img_allowed_formats case-insensitively, as was done in
    3.20141016.3
  * inline: restore backwards compat for show=-1 syntax, which
    worked before 3.20160121
  * Remove a spurious changelog entry from 3.20160506 (the relevant
    change was already in 3.20150614)
  * Add CVE-2016-4561 reference to 3.20160506 changelog
  * Set high urgency to get the CVE-2016-4561 fix and CVE-2016-3714
    mitigation into testing

 -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
2016-05-10 06:12:17 +00:00
schmonz
914448ff1e Update to 3.20160506. From the changelog:
[ Simon McVittie ]
  * img: stop ImageMagick trying to be clever if filenames contain a colon,
    avoiding mis-processing
  * HTML-escape error messages, in one case avoiding potential cross-site
    scripting (OVE-20160505-0012)
  * Mitigate ImageMagick vulnerabilities such as CVE-2016-3714:
    - img: force common Web formats to be interpreted according to extension,
      so that "allowed_attachments: '*.jpg'" does what one might expect
    - img: restrict to JPEG, PNG and GIF images by default, again mitigating
      CVE-2016-3714 and similar vulnerabilities
    - img: check that the magic number matches what we would expect from
      the extension before giving common formats to ImageMagick
  * d/control: use https for Homepage
  * d/control: add Vcs-Browser

  [ Joey Hess ]
  * img: Add back support for SVG images, bypassing ImageMagick and
    simply passing the SVG through to the browser, which is supported by all
    commonly used browsers these days.
    SVG scaling by img directives has subtly changed; where before
    size=wxh would preserve aspect ratio, this cannot be done when passing
    them through and so specifying both a width and height can change
    the SVG's aspect ratio.
  * loginselector: When only openid and emailauth are enabled, but
    passwordauth is not, avoid showing a "Other" box which opens an
    empty form.

  [ Amitai Schlair ]
  * mdwn: Process .md like .mdwn, but disallow web creation.

  [ Florian Wagner ]
  * git: Correctly handle filenames starting with a dash in add/rm/mv.

 -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
2016-05-07 05:58:53 +00:00