diff options
author | Ondřej Surý <ondrej@debian.org> | 2018-11-07 04:17:56 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@debian.org> | 2018-11-07 04:17:56 +0100 |
commit | 67b8f0366d373ae697ac206b2571813a6e7afd88 (patch) | |
tree | 98280b46ecfc1f021502fa4e91652acfa708aa77 | |
parent | 438ebcdc58e6cb4a6490d0d84803c8eb9aad5627 (diff) | |
parent | 076963197344b61294224a9dbd5469f30f0ae83d (diff) |
rss-bridge (2018-07-17-1.2) unstable; urgency=medium
* Non-maintainer upload.
* Fix the nginx.conf configuration to not use hardcoded PHP version
(Closes: #911835)
[dgit import unpatched rss-bridge 2018-07-17-1.2]
-rw-r--r-- | debian/changelog | 62 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/config.ini.php | 44 | ||||
-rw-r--r-- | debian/control | 22 | ||||
-rw-r--r-- | debian/copyright | 52 | ||||
-rw-r--r-- | debian/nginx.conf.in | 12 | ||||
-rw-r--r-- | debian/rss-bridge.dirs | 1 | ||||
-rw-r--r-- | debian/rss-bridge.docs | 1 | ||||
-rw-r--r-- | debian/rss-bridge.install | 10 | ||||
-rw-r--r-- | debian/rss-bridge.links | 3 | ||||
-rwxr-xr-x | debian/rules | 15 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/tests/control | 7 | ||||
-rw-r--r-- | debian/tests/general | 11 | ||||
-rwxr-xr-x | debian/tests/whitelist | 15 | ||||
-rw-r--r-- | debian/watch | 4 | ||||
-rw-r--r-- | debian/whitelist.txt | 16 |
17 files changed, 277 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..daefed4 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,62 @@ +rss-bridge (2018-07-17-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix the nginx.conf configuration to not use hardcoded PHP version + (Closes: #911835) + + -- Ondřej Surý <ondrej@debian.org> Wed, 07 Nov 2018 03:17:56 +0000 + +rss-bridge (2018-07-17-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Don't restart phpX.Y-fpm in the autopkgtests, it's not needed + (Closes: #911835) + + -- Ondřej Surý <ondrej@debian.org> Sun, 04 Nov 2018 20:10:47 +0000 + +rss-bridge (2018-07-17-1) unstable; urgency=medium + + * New upstream release 2018-07-17 + * debian/control: fix my name + * debian/control: rss-bridge has to depend on php-xml for simplexml + * debian/whitelist.txt: use version from upstream + * debian/rss-bridge.install: also install config.default.ini.php + * add config file /etc/rss-bridge/config.ini.php + * add autopkgtest to check if the whitelist is still up to date + + -- Johannes 'josch' Schauer <josch@debian.org> Fri, 20 Jul 2018 18:46:30 +0200 + +rss-bridge (2018-03-11-1) unstable; urgency=medium + + * New upstream release 2018-03-11 + * debian/watch: do not run uupdate + * debian/control: Add Rules-Requires-Root: binary-targets + * debian/control: Replace Priority:extra by optional + * Bump Standards-Version to 4.1.3 (no changes) + * Bump debhelper compat level to 11 + * debian/rules: remove workaround for upstream issue #561 + * debian/control: Add new dependency php-mbstring + * debian/control: Move apache and ngnix to Recommends + * add autopkgtest + + -- Johannes Schauer <josch@debian.org> Wed, 28 Mar 2018 01:14:55 +0200 + +rss-bridge (2017-08-03-3) unstable; urgency=medium + + * correct php dependencies s/php5/php/g + + -- Johannes Schauer <josch@debian.org> Sat, 05 Aug 2017 23:11:01 +0200 + +rss-bridge (2017-08-03-2) unstable; urgency=medium + + * add nginx.conf example + * add php modules to Depends + * add debian/watch + + -- Johannes Schauer <josch@debian.org> Sat, 05 Aug 2017 22:16:44 +0200 + +rss-bridge (2017-08-03-1) unstable; urgency=medium + + * Initial release. (Closes: #870687) + + -- Johannes Schauer <josch@debian.org> Fri, 04 Aug 2017 22:06:01 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/config.ini.php b/debian/config.ini.php new file mode 100644 index 0000000..318b16c --- /dev/null +++ b/debian/config.ini.php @@ -0,0 +1,44 @@ +; <?php exit; ?> DO NOT REMOVE THIS LINE + +; This file contains the host-specific changes to the default configuration +; of RSS-Bridge. The default configuration can be found under +; /usr/share/rss-bridge/config.default.ini.php + +[cache] + +; Allow users to specify custom timeout for specific requests. +; true = enabled +; false = disabled (default) +custom_timeout = false + +[proxy] + +; Sets the proxy url (i.e. "tcp://192.168.0.0:32") +; "" = Proxy disabled (default) +url = "" + +; Sets the proxy name that is shown on the bridge instead of the proxy url. +; "" = Show proxy url +name = "Hidden proxy name" + +; Allow users to disable proxy usage for specific requests. +; true = enabled +; false = disabled (default) +by_bridge = false + +[authentication] + +; Enables authentication for all requests to this RSS-Bridge instance. +; +; Warning: You'll have to upgrade existing feeds after enabling this option! +; +; true = enabled +; false = disabled (default) +enable = false + +; The username for authentication. Insert this name when prompted for login. +username = "" + +; The password for authentication. Insert this password when prompted for login. +; Use a strong password to prevent others from guessing your login! +password = "" diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..41d8e74 --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: rss-bridge +Section: web +Priority: optional +Maintainer: Johannes 'josch' Schauer <josch@debian.org> +Homepage: https://github.com/RSS-Bridge/rss-bridge +Vcs-Browser: https://browse.dgit.debian.org/rss-bridge.git/ +Vcs-Git: https://git.dgit.debian.org/rss-bridge +Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 11), php-cli +Rules-Requires-Root: binary-targets + +Package: rss-bridge +Architecture: all +Depends: ${misc:Depends}, php-curl, php-json, php-mbstring, php-xml +Recommends: apache2 | nginx | httpd, libapache2-mod-php | php-fpm | php-cgi +Description: web service generating ATOM feeds for websites that don't have them + Provides a PHP web service which generates ATOM feeds for facebook, twitter, + youtube, flickr, google, instagram, pinterest and more than 130 other web + services which do not provide ATOM or RSS feeds themselves. The software acts + as a proxy between the web service and an RSS reader software. It scrapes + their publicly available HTML pages to extract the necessary information. + To prevent banning, the results are cached. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..99c89e4 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,52 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: rss-bridge +Upstream-Contact: https://github.com/RSS-Bridge/rss-bridge/issues +Source: https://github.com/RSS-Bridge/rss-bridge + +Files: * +Copyright: 2013-2014 sebsauvage <sebsauvage@sebsauvage.net> + 2014-2017 Mitsukarenai <mitsu@suumitsu.eu> + 2016-2017 Pierre Mazière <pierre.maziere@gmx.com> + 2015-2017 logmanoriginal <log.man@gmx.de> +License: public-domain + This is free and unencumbered software released into the public domain. + . + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + . + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + +Files: debian/* +Copyright: 2017 Johannes Schauer <josch@debian.org> +License: Expat + +Files: vendor/simplehtmldom/simple_html_dom.php +Copyright: S.C. Chen <me578022@gmail.com> + John Schlick + Rus Carroll + Jose Solorzano + Yousuke Kumakura + Vadim Voituk + Antcs +License: Expat +Comment: https://sourceforge.net/p/simplehtmldom/feature-requests/47/ + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. diff --git a/debian/nginx.conf.in b/debian/nginx.conf.in new file mode 100644 index 0000000..63ea8c0 --- /dev/null +++ b/debian/nginx.conf.in @@ -0,0 +1,12 @@ +server { + listen 80; + root /usr/share/rss-bridge; + index index.php; + + location /index.php { + fastcgi_pass unix:/var/run/php/php@PHP_VERSION@-fpm.sock; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; + } +} diff --git a/debian/rss-bridge.dirs b/debian/rss-bridge.dirs new file mode 100644 index 0000000..72c62be --- /dev/null +++ b/debian/rss-bridge.dirs @@ -0,0 +1 @@ +/var/cache/rss-bridge diff --git a/debian/rss-bridge.docs b/debian/rss-bridge.docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/rss-bridge.docs @@ -0,0 +1 @@ +README.md diff --git a/debian/rss-bridge.install b/debian/rss-bridge.install new file mode 100644 index 0000000..31b2869 --- /dev/null +++ b/debian/rss-bridge.install @@ -0,0 +1,10 @@ +./bridges /usr/share/rss-bridge +./lib /usr/share/rss-bridge +./index.php /usr/share/rss-bridge +./formats /usr/share/rss-bridge +./caches /usr/share/rss-bridge +./static /usr/share/rss-bridge +./vendor /usr/share/rss-bridge +./config.default.ini.php /usr/share/rss-bridge +debian/whitelist.txt /etc/rss-bridge +debian/config.ini.php /etc/rss-bridge diff --git a/debian/rss-bridge.links b/debian/rss-bridge.links new file mode 100644 index 0000000..fb265f7 --- /dev/null +++ b/debian/rss-bridge.links @@ -0,0 +1,3 @@ +/var/cache/rss-bridge /usr/share/rss-bridge/cache +/etc/rss-bridge/whitelist.txt /usr/share/rss-bridge/whitelist.txt +/etc/rss-bridge/config.ini.php /usr/share/rss-bridge/config.ini.php diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..fbc17e0 --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f +%: + dh $@ + +PHP_VERSION=$(shell phpquery -V | head -1) + +override_dh_install: + dh_install + install -d -o www-data -g www-data $(CURDIR)/debian/rss-bridge/var/cache/rss-bridge + mkdir -p $(CURDIR)/debian/rss-bridge/usr/share/doc/rss-bridge/examples + sed -e 's/@PHP_VERSION@/$(PHP_VERSION)/' \ + < debian/nginx.conf.in > $(CURDIR)/debian/rss-bridge/usr/share/doc/rss-bridge/examples/nginx.conf + +override_dh_fixperms: + dh_fixperms --exclude /var/cache/rss-bridge diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..48f8f11 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,7 @@ +Tests: general +Restrictions: allow-stderr, isolation-container, needs-root +Depends: @, curl, nginx, php-fpm + +Tests: whitelist +Restrictions: allow-stderr +Depends: @, php-cli diff --git a/debian/tests/general b/debian/tests/general new file mode 100644 index 0000000..d56a7b7 --- /dev/null +++ b/debian/tests/general @@ -0,0 +1,11 @@ +#!/bin/sh + +set -ex + +rm /etc/nginx/sites-enabled/default +cp /usr/share/doc/rss-bridge/examples/nginx.conf /etc/nginx/sites-available/rss-bridge +ln -s ../sites-available/rss-bridge /etc/nginx/sites-enabled/rss-bridge + +systemctl restart nginx + +curl --silent localhost | grep '<h1>RSS-Bridge</h1>' diff --git a/debian/tests/whitelist b/debian/tests/whitelist new file mode 100755 index 0000000..e5b8e99 --- /dev/null +++ b/debian/tests/whitelist @@ -0,0 +1,15 @@ +#!/bin/sh + +set -exu + +# check whether the whitelist.txt supplied by the Debian package is the same +# that would be generated by upstream's index.php +# +# we have to copy the code to a new location because otherwise we cannot remove +# whitelist.txt and have no write access to the cache directory +cp -a /usr/share/rss-bridge "$ADTTMP" +rm "$ADTTMP/rss-bridge/whitelist.txt" +rm "$ADTTMP/rss-bridge/cache" +mkdir "$ADTTMP/rss-bridge/cache" +php "$ADTTMP/rss-bridge/index.php" +diff -u "$ADTTMP/rss-bridge/whitelist.txt" /usr/share/rss-bridge/whitelist.txt diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..b477cbc --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts="filenamemangle=s%(?:.*?)?(\d\d\d\d-\d\d-\d\d)\.tar\.gz%rss-bridge-$1.tar.gz%" \ + https://github.com/RSS-Bridge/rss-bridge/tags \ + (?:.*?/)?(\d\d\d\d-\d\d-\d\d)\.tar\.gz debian diff --git a/debian/whitelist.txt b/debian/whitelist.txt new file mode 100644 index 0000000..4cbdae1 --- /dev/null +++ b/debian/whitelist.txt @@ -0,0 +1,16 @@ +BandcampBridge +CryptomeBridge +DansTonChatBridge +DuckDuckGoBridge +FacebookBridge +FlickrExploreBridge +GooglePlusPostBridge +GoogleSearchBridge +IdenticaBridge +InstagramBridge +OpenClassroomsBridge +PinterestBridge +ScmbBridge +TwitterBridge +WikipediaBridge +YoutubeBridge
\ No newline at end of file |