From nobody Sat Jun 18 13:44:40 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4D2E7864606; Sat, 18 Jun 2022 13:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LQHG01jQnz3kDV; Sat, 18 Jun 2022 13:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655559880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRGriBgipsR0ftlJDWLaJAkRHuM/hET0Q1IUQZX1afc=; b=hNKw1AC8YMmHvxo1FCsTrRHhuswvjBUGUaV8KdrtQ1jSXm080XveDODg+mzNVVG/aYdZOS DnzM2Boop8SVL/Ii1HELOSZkRguwyyBo4rgeMR5qDB/vk8FPQeuQ2mZ787tj0TQemDW+IS NhEkITxBXrsFH7MkufgXD3fwqjwMBetZQ/yMaIZOcRO2yy4UtRqRws5+7BhaBXBjjcrI8I Bpg0Y/jO+M9dj5E10Yu/CmTuaVhWDsjv9/zyv/SWo4UtLh04mHJGdPSb84O6mBp0pTJEw/ 8Zo9z8spcecTyAIE5/bKiMk/23DyoV2Meq6iK9V851yR5SmNqkC+6+etCu+wJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A77315369; Sat, 18 Jun 2022 13:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25IDie1s093340; Sat, 18 Jun 2022 13:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25IDieXf093339; Sat, 18 Jun 2022 13:44:40 GMT (envelope-from git) Date: Sat, 18 Jun 2022 13:44:40 GMT Message-Id: <202206181344.25IDieXf093339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 8caa9136c639 - main - www/Stikked: Update to 0.14.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8caa9136c639c3e9e14c148bb82033685bffe283 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655559880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRGriBgipsR0ftlJDWLaJAkRHuM/hET0Q1IUQZX1afc=; b=UWri2ECiQOvsbRzjy372k7hX7VNAC7TYetYxV7TmKlp769AtQjqCuTyn/Rrw/1VgPF+9ER 9cgcN5ljGNmN3KIC81H8nZFMmydnVoLIqtc3iIXoeHIi6A4PCooXnJR0E6vNPm4XAyn51u mgncCKQ5TRjoY+gVO7YQgZ9JUYPB1FLywwkId161DdonUlAkIXrXUYCZceWE4qMwqqygnW 96SwXrgbNsXbWfgr/aUK0AQJbmh3Hh6tfweKMu2auesF3wVCJSfmV2JWdtaj50r92ZHv1D if+7Ag7l1L2fiiZeCD/nRva7a1KHAYMIyXtqHuZbyBBkuVPzGEKpQel1uFVplg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655559880; a=rsa-sha256; cv=none; b=QEtVv8QAB2690koaHEpuDDOAUOY+JKV8frUhj0a0smCImn/H4J+heSDgVc9ezxYxn2KmPS mu6euvpV1Uxpq9kmli92nmBTi9Fm+Dqq98PnKEAh712odt6SJW5rUESggCAn7uWlbtimHx aJ/2jKRMrw9ISpUq7aicn3AKg6ZaoThg+JiXVEDcY0gA/t48IHgIazIj8kphnd9qtNAN3Z xCVfQjKGdxWiMwBXScFYOnhlLqfxnpjFrAWaFan8XZlEzu6Uclq4vHdcJ2OpnxamfO0eVO G18a+0qUiRJ5+Z9YSIU5USI0h75n3+qrvxJhVdgGY4a/tZPVO5SoQDBKdzc7Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=8caa9136c639c3e9e14c148bb82033685bffe283 commit 8caa9136c639c3e9e14c148bb82033685bffe283 Author: Dan Langille AuthorDate: 2022-06-18 12:54:36 +0000 Commit: Dan Langille CommitDate: 2022-06-18 13:44:30 +0000 www/Stikked: Update to 0.14.0 --- www/Stikked/Makefile | 3 +- www/Stikked/distinfo | 6 ++-- ...atch-htdocs_application_config_stikked.php.dist | 4 +-- .../patch-htdocs_application_models_Pastes.php | 38 +++++++++++----------- www/ot-recorder/files/patch-misc.c | 12 ------- 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/www/Stikked/Makefile b/www/Stikked/Makefile index d39b3be19d09..420c5bd6fac7 100644 --- a/www/Stikked/Makefile +++ b/www/Stikked/Makefile @@ -1,8 +1,7 @@ # Created by: Dan Langille PORTNAME= Stikked -DISTVERSION= 0.13.0 -PORTREVISION= 2 +DISTVERSION= 0.14.0 CATEGORIES= www MAINTAINER= dvl@FreeBSD.org diff --git a/www/Stikked/distinfo b/www/Stikked/distinfo index d2eed38c5b43..b3a4a3f47a5b 100644 --- a/www/Stikked/distinfo +++ b/www/Stikked/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538678447 -SHA256 (claudehohl-Stikked-0.13.0_GH0.tar.gz) = bd6695268a899a1d562b0deff1b67e0522f0e0ef818413e392cc182d3aa82566 -SIZE (claudehohl-Stikked-0.13.0_GH0.tar.gz) = 10644340 +TIMESTAMP = 1655555745 +SHA256 (claudehohl-Stikked-0.14.0_GH0.tar.gz) = 50a2540c234484b44dba713553c15f3a96da00cb7067e976e9ad49c3be1eec5a +SIZE (claudehohl-Stikked-0.14.0_GH0.tar.gz) = 10648711 diff --git a/www/Stikked/files/patch-htdocs_application_config_stikked.php.dist b/www/Stikked/files/patch-htdocs_application_config_stikked.php.dist index 85a83cbc508a..aee0c3215950 100644 --- a/www/Stikked/files/patch-htdocs_application_config_stikked.php.dist +++ b/www/Stikked/files/patch-htdocs_application_config_stikked.php.dist @@ -1,6 +1,6 @@ ---- htdocs/application/config/stikked.php.dist.orig 2017-12-13 15:26:05 UTC +--- htdocs/application/config/stikked.php.dist.orig 2019-11-24 16:10:45 UTC +++ htdocs/application/config/stikked.php.dist -@@ -17,6 +17,19 @@ $config['site_name'] = 'Stikked'; +@@ -19,6 +19,19 @@ $config['site_name'] = 'Stikked'; $config['base_url'] = 'https://yourpastebin.com/'; /** diff --git a/www/Stikked/files/patch-htdocs_application_models_Pastes.php b/www/Stikked/files/patch-htdocs_application_models_Pastes.php index b43993574e20..8ab255d8c233 100644 --- a/www/Stikked/files/patch-htdocs_application_models_Pastes.php +++ b/www/Stikked/files/patch-htdocs_application_models_Pastes.php @@ -1,21 +1,21 @@ ---- htdocs/application/models/Pastes.php.orig 2017-12-13 15:21:30 UTC +--- htdocs/application/models/Pastes.php.orig 2022-06-18 12:47:43 UTC +++ htdocs/application/models/Pastes.php -@@ -56,8 +56,16 @@ class Pastes extends CI_Model - { - $data['created'] = time(); +@@ -32,8 +32,16 @@ class Pastes extends CI_Model + { + $data['created'] = time(); + +- //this is SO evil… saving the «raw» data with htmlspecialchars :-( (but I have to leave this, because of backwards-compatibility) +- $data['raw'] = htmlspecialchars($this->_strip_bad_multibyte_chars($this->input->post('code'))); ++ if ($this->config->item('true_paste')) ++ { ++ // save the paste as supplied ++ $data['raw'] = $this->input->post('code'); ++ } ++ else ++ { ++ //this is SO evil… saving the «raw» data with htmlspecialchars :-( (but I have to leave this, because of backwards-compatibility) ++ $data['raw'] = htmlspecialchars($this->_strip_bad_multibyte_chars($this->input->post('code'))); ++ } + $data['lang'] = htmlspecialchars($this->input->post('lang')); + $data['replyto'] = ($this->input->post('reply') === null ? '0' : $this->input->post('reply')); -- //this is SO evil… saving the «raw» data with htmlspecialchars :-( (but I have to leave this, because of backwards-compatibility) -- $data['raw'] = htmlspecialchars($this->_strip_bad_multibyte_chars($this->input->post('code'))); -+ if ($this->config->item('true_paste')) -+ { -+ // save the paste as supplied -+ $data['raw'] = $this->input->post('code'); -+ } -+ else -+ { -+ //this is SO evil… saving the «raw» data with htmlspecialchars :-( (but I have to leave this, because of backwards-compatibility) -+ $data['raw'] = htmlspecialchars($this->_strip_bad_multibyte_chars($this->input->post('code'))); -+ } - $data['lang'] = htmlspecialchars($this->input->post('lang')); - $data['replyto'] = ($this->input->post('reply') === null ? '0' : $this->input->post('reply')); - diff --git a/www/ot-recorder/files/patch-misc.c b/www/ot-recorder/files/patch-misc.c deleted file mode 100644 index 2ae63fd66f07..000000000000 --- a/www/ot-recorder/files/patch-misc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- misc.c.orig 2019-08-01 13:54:47 UTC -+++ misc.c -@@ -62,7 +62,8 @@ void monitorhook(struct udata *userdata, time_t now, c - static UT_string *us = NULL; - - utstring_renew(us); -- utstring_printf(us, "%ld %s\n", now, topic); -+ utstring_printf(us, "%ld %s\n", (long)now, topic); -+ - - snprintf(mpath, sizeof(mpath), "%s/monitor", STORAGEDIR); - safewrite(mpath, UB(us));