x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

debbugs.git - x2gobugs (branch) updated: 0acf95940a48cb3a0944a6219ce93254b178c26c
by git-admin＠x2go.org 15 May '13

15 May '13

The branch, x2gobugs has been updated via 0acf95940a48cb3a0944a6219ce93254b178c26c (commit) from 1d824e0b4c0e24396484f0184cce67d3d189598f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0acf95940a48cb3a0944a6219ce93254b178c26c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 15 10:01:28 2013 +0200 Avoid httpd log messages of missing »dot« executable. Add graphviz to Recommends: field of bin:package libdebbugs-perl. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 2 ++ 2 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4c2a07e..85114a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low [ Mike Gabriel ] * /debian/control: + Add ${misc:Depends} to Depends. + + Avoid httpd log messages of missing »dot« executable. Add graphviz to + Recommends: field of bin:package libdebbugs-perl. * /examples/apache.conf: - Assure in apache.conf example that documentation html pages get loaded (closes: #686943). diff --git a/debian/control b/debian/control index ec79ce8..29a5db6 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,8 @@ Depends: libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, libcgi-simple-perl, libparams-validate-perl, libtext-template-perl, libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl, +Recommends: + graphviz, Section: perl Description: modules used by the active Debian BTS Debian has a bug tracking system which files details of bugs reported by hooks/post-receive -- debbugs.git (debbugs upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "debbugs.git" (debbugs upstream project).

1 0

debbugs.git - x2gobugs (branch) created: 1d824e0b4c0e24396484f0184cce67d3d189598f
by git-admin＠x2go.org 15 May '13

15 May '13

The branch, x2gobugs has been created at 1d824e0b4c0e24396484f0184cce67d3d189598f (commit) - Log ----------------------------------------------------------------- commit 1d824e0b4c0e24396484f0184cce67d3d189598f Merge: 9c634da 428eb45 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 15 09:42:05 2013 +0200 Merge branch 'master' into x2gobugs Conflicts (resolved by Mike Gabriel): Debbugs/UTF8.pm commit 9c634da215fff2a89be446f19e4b3b136cea34c5 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 15:08:40 2013 -0700 fix pod test to not look at editor temp files commit 16c96763836cd8e347abe3b97cf2276564e1daa5 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 15:02:41 2013 -0700 change convert_to_utf8 to attempt to fix doubly encoded things commit 5bc861cb1b2acb6af7b6a146f1f77cd0cfccc6a2 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 14:41:33 2013 -0700 fix unterminated B<> sequence sort bugs by number in rebuild it's index.db.realtime, not index.db-h.realtime. commit 6369424d26d340c4a39c8b4cf165ece8f3c9685d Merge: fb8cc02 cebcfe4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 21 21:16:32 2013 +0100 Merge branch 'master' into x2gobugs Conflicts (resolved by Mike Gabriel): debian/control commit fb8cc02379d5824289241406fba29403c43a999b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 20 12:07:42 2013 +0100 /debian/control: de-capitalize description synopsis lines commit 0cda28c7c4ee9cbcd7444894fb9738fecc6283df Author: Don Armstrong <don(a)donarmstrong.com> Date: Tue Mar 19 15:19:58 2013 -0700 write to bug closers in UTF-8 commit 48150ad62e1697eba8fd8787fd915c4c2a31ead8 Author: Don Armstrong <don(a)donarmstrong.com> Date: Mon Mar 18 10:42:15 2013 -0700 Fix double encoding of attachments (closes: #703300) commit fbaf33fde6c96706280897bcf95c4aface209410 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 19 11:48:56 2013 +0100 Pass param bug=<NNN> to bugreport.html call in bugreport.cgi. commit f04d0316844a66321e871bb0bcc4688ea260e68c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:48:44 2013 +0100 Raise Standards to 3.9.4 (after fixing several lintian issues). commit 91a156aa86614e58a885f907c5a607722255c3b0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:36:27 2013 +0100 * Fix lintian issues: libdebbugs-perl: spelling-error-in-manpage for: + usr/share/man/man3/Debbugs::Recipients.3pm.gz + usr/share/man/man3/Debbugs::SOAP.3pm.gz + usr/share/man/man3/Debbugs::Status.3pm.gz commit 87582ed45d293eace9b0e3161918dac88e9666f7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:42:48 2013 +0100 Fix lintian issues: debbugs source: debian-rules-makemaker-prefix-is-deprecated line 44, debian-rules-makemaker-prefix-is-deprecated line 56. commit b7a180ea9ee7e91c89e15a8a8e3ccf6a981997b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:27:57 2013 +0100 Fix lintian issue: debbugs source: duplicate-in-relation-field in libdebbugs-perl depends: libtext-template-perl, libtext-template-perl. commit 5086eda3bbcae79860f148b7f7588fa459acf2d3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:19:38 2013 +0100 another typo in changelog commit add8dc8be5716f54d74e76bd8c100a40d8d54b79 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:14:01 2013 +0100 Switch to debian/source/format: 3.0 (native). commit b057c1ae3d5f6a1503fc852f827c17e67792c8f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:13:01 2013 +0100 Fix lintian issues: debian-rules-missing-recommended-target build-arch, debian-rules-missing-recommended-target build-indep. commit ec7cebfc2bc87b01a6592c6276e7254e47786b6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:10:48 2013 +0100 Fix lintian issue: description-synopsis-starts-with-article, also: capitalize first letter in all description synopsis lines. commit 6f54d6712f01196fa2663875952bb4544251c75f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:08:52 2013 +0100 have a length < 0 (closes: #688344). * Fix spelling error in /debian/changelog. commit 94c167e3ec31922b901b9e61a68775aa954ff29a Merge: 0c4ded4 d1fb15b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 10:40:12 2013 +0100 Merge branch 'master' into x2gobugs Conflicts (resolved by Mike Gabriel): cgi/pkgindex.cgi debian/changelog scripts/process commit 0c4ded463d1275aa447323f2355ee89ad0c2d6a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 28 14:29:00 2012 +0200 Use locale independent LC_TIME settings. commit 2d22c14d461161826ffeebe164a3a0737ca99f27 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 13:45:27 2012 +0200 add links_only option to package_links call commit 1bd7ff8b599048b29be47c29e7601991b6210e76 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 12:08:15 2012 +0200 Use locale independent date format for mail processing. commit 7c95815e7b47588e4982238e099fa48eb2e78ee3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 21 21:57:14 2012 +0200 Make sure that mails to gSubscriptionDomain and gBugSubscriptionDomain are only sent out if the variables in config are defined and have a lenght < 0. commit 6197039add963aa3878a36fe6e4d4a6644055f35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 21 21:14:05 2012 +0200 Provide gStrongList configuration option in config file to make a site admin aware of its existence. commit 02ac261b85546180c7979cf48e16e0fdbb3bcdc8 Author: Don Armstrong <don(a)donarmstrong.com> Date: Mon Sep 17 15:04:04 2012 -0700 fix missing + commit f0e4893b547541b60556fc4ba4271f6091bd73fc Author: Don Armstrong <don(a)donarmstrong.com> Date: Mon Sep 17 14:54:09 2012 -0700 work around broken .debinfo files by faking the binarch from the filename if there are only four fields. commit dbdf2f7b944c76f751df4c6d1da6afa77faa3d05 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 19 22:06:17 2012 +0200 Update postfix section in Readme.mail. Closes: #688109. commit d11ffb74ddaf866d970739f7a36fd04386aee2cd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 13:41:50 2012 +0200 fix-up commit for 319f07201 commit 26bf3833c0455e2b8df36f035d48a62eadd45235 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 11:42:05 2012 +0200 Remove mailing list markers of the form [<list-name>] from the subject line to avoid duplication (and more) of the bug number when replying to bug postings. commit cb371c2699d5f01ef7d93ab347b10ab8689025eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 11:39:45 2012 +0200 Revert "Remove mailing list markers of the form [<list-name>] from the subject line to avoid duplication (and more) of the bug number when replying to bug postings." This reverts commit d90816917235b37bcb6a5811e0c9988265f10716. commit d90816917235b37bcb6a5811e0c9988265f10716 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 11:37:57 2012 +0200 Remove mailing list markers of the form [<list-name>] from the subject line to avoid duplication (and more) of the bug number when replying to bug postings. commit 1510f405e595d100626cbe27bd54ac0fa92f8d83 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 11:09:37 2012 +0200 Add empty $gBugSubscriptionDomain variable to config file template. commit a3861e356f1cd8de437562d97b2e88d810c77709 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 10:19:12 2012 +0200 commenting out bcc mails to bugs=xxx@gListDomain for now commit 5e3a5c06e97ddfddb62421eec6f4a80bcc2d2bed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 09:10:46 2012 +0200 changelog cleanup for last commits commit 9220ef7e2ec88c02882c40be1059708d5b80c8f7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 08:31:13 2012 +0200 Allow directory index for /var/lib/debbugs/www to be shown TTW (in apache.conf example). commit bdfb1a5c198bc247257619e3d245ca8df09599aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 10 13:09:29 2012 +0200 Let generated index pages load css file. commit 2c7b0fb5a048a753dfce9c4d20154e18815bcc35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 10 13:05:18 2012 +0200 Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be overridden in /var/lib/debbugs/www/db to allow mod_expires apache configuration options in .htaccess. commit c87743e9bafcda449d49c7a5ca1d443fe8a41958 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 10 12:16:44 2012 +0200 /debian/control: Add ${misc:Depends} to Depends. commit 319f072013093bfbd36877b4d36c06a078de01c6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 12 09:04:49 2012 +0200 Fix pkgindex.cgi concerning several issues: load proper Perl modules, replace usage of src_url and pkg_url by package_links, use html_tail from templates, use count_bugs everywhere, load bugs.css, fix global variable usage in html header. commit 1f8c57e325076a9b1d36006e26ef582036975a73 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:41:23 2012 +0200 Be more generic, comment out rewrite rule that directly redirects http://<debbugs-webhost>/ to http://www.debian.org/Bugs. commit 48efcc9948f368768e363870f00f28938f5670e9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:34:11 2012 +0200 Fix sani function in scripts/errorlib. Generate html entities correctly (prepend ampersand, append semicolon). commit 0ec3707781c29961101b94be8540bb3f4ed549c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:31:15 2012 +0200 Rewrite rule example: http://<webhost>/<nnn> -> show bug report for bug <nnn>. commit a9ec06380c5f1285cddd6de7003161eca32db701 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:27:51 2012 +0200 Assure in apache.conf example that documentation html pages get loaded. commit 8c43133209896a77254086bfceaf19ff701e65ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:24:04 2012 +0200 Load bugs.css file in documentation html pages. commit e70bf19c7c93a6b7bd89a785b5a02d1bbf087c77 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:22:47 2012 +0200 mark package as unreleased to make dch work correctly commit 910a3f20a6baf5f2a5446186ff902bfc8fa8d308 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 8 22:21:37 2012 +0200 add Mike Gabriel to uploaders, do not document this in changelog, as it is for local development only ----------------------------------------------------------------------- hooks/post-receive -- debbugs.git (debbugs upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "debbugs.git" (debbugs upstream project).

1 0

debbugs.git - master (branch) updated: 428eb4599f1aad8c4c5b71d02b91252a1daba24d
by git-admin＠x2go.org 15 May '13

15 May '13

The branch, master has been updated via 428eb4599f1aad8c4c5b71d02b91252a1daba24d (commit) via 089ed434abbcbbf03e7732ad362162a55c0e396e (commit) via 94c99b69df4bb1d9b4859b4796c99d0a4d9d4ae4 (commit) via ded1b3d0daf464ae240e9e088edc30986992537a (commit) via 7b81a1095047ef5126801584fae1e6b9312f9558 (commit) via 440928d5e9210df53eb54101a4d876d99c2ad531 (commit) via 876d0c2a281d0198ed392a5ba5a307e1b200b132 (commit) via aa087e76db76df3c8e8a9e052aefcb99371880f6 (commit) via 5257767d84ebdc3c2c766bcecee6c046f5e78d5d (commit) via cebcfe4a025c588c5f9197b706a1b3c0ca61653e (commit) via 337e79cfd28d94749e681048fb8b32441ba37ff5 (commit) via 45c0f862895dfe537b2ed6e55cca35b4565abe63 (commit) via c1e75d95c13f6eee442bbe0e383aa3944a2cbe3b (commit) via dda4ac413007e12639f709e8e1a41c3583e78e36 (commit) via de4869db73405466eec3f35456231ee051b1cb3d (commit) via 32c86fe1d577f9710bdc1edb34714780ea145d0c (commit) via 69c0b42f8328d3fb131d7658872313d377a5acc3 (commit) via ede5f340a093569596670be592d4aace355df05a (commit) via 3b6ca55f3178b27eec3e96c430e541aa9e080791 (commit) via b3380601fced230e566b5fee2f21db826f999f51 (commit) via e2215900b43a05781a2ab0aa1394863f851c4701 (commit) via 70959f30862c73643bbe2a6b62711ff742cc29f7 (commit) via d1cb3d4f7526a5103cffd722957bb7f8b323519e (commit) via 46bcc11ec89bfe72d7fa11fff0cb762b346b8a03 (commit) via e21d955ffd42e6f59c67cd52681b782d40cf41a9 (commit) via dd641f972d763dd79422ea216f4024dc3679e34c (commit) via 09cf3ac4a9ef1c2fad6b3b5585ae65316960e837 (commit) from d1fb15bad755ce96c840a5b1fa37986353d41e1a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 428eb4599f1aad8c4c5b71d02b91252a1daba24d Author: Don Armstrong <don(a)donarmstrong.com> Date: Mon May 6 16:01:03 2013 -0700 accept -1 in addition to 0 for the current message in summary/outlook; properly handle control psuedoheaders commit 089ed434abbcbbf03e7732ad362162a55c0e396e Author: Don Armstrong <don(a)donarmstrong.com> Date: Fri Apr 19 13:27:10 2013 -0700 encode all strings to bytes before including in estraier commit 94c99b69df4bb1d9b4859b4796c99d0a4d9d4ae4 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Apr 4 10:25:02 2013 -0700 Text::Iconv has a bug where it fails to reset the converter with a call to iconv(cd,NULL,(size_t) 0,NULL,(size_t) 0) if it fails during conversion; always create a new Text::Iconv object to work around this commit ded1b3d0daf464ae240e9e088edc30986992537a Author: Don Armstrong <don(a)donarmstrong.com> Date: Tue Apr 2 10:13:22 2013 -0700 check the log modified time of an optional gziped log commit 7b81a1095047ef5126801584fae1e6b9312f9558 Author: Don Armstrong <don(a)donarmstrong.com> Date: Fri Mar 22 12:13:41 2013 -0700 use a div instead of p for the headers; use headerfield for the field areas; increase padding for pre.message commit 440928d5e9210df53eb54101a4d876d99c2ad531 Merge: 876d0c2 aa087e7 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 15:08:54 2013 -0700 Merge branch 'don/rebuild-index' commit 876d0c2a281d0198ed392a5ba5a307e1b200b132 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 15:08:40 2013 -0700 fix pod test to not look at editor temp files commit aa087e76db76df3c8e8a9e052aefcb99371880f6 Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 15:02:41 2013 -0700 change convert_to_utf8 to attempt to fix doubly encoded things commit 5257767d84ebdc3c2c766bcecee6c046f5e78d5d Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 14:41:33 2013 -0700 fix unterminated B<> sequence sort bugs by number in rebuild it's index.db.realtime, not index.db-h.realtime. commit cebcfe4a025c588c5f9197b706a1b3c0ca61653e Merge: 45c0f86 337e79c Author: Don Armstrong <don(a)donarmstrong.com> Date: Thu Mar 21 10:39:04 2013 -0700 Merge branch 'don/rebuild-index' commit 337e79cfd28d94749e681048fb8b32441ba37ff5 Author: Don Armstrong <don(a)donarmstrong.com> Date: Wed Mar 20 17:54:50 2013 -0700 make generate_status_line handle bug not being defined in data commit 45c0f862895dfe537b2ed6e55cca35b4565abe63 Merge: c1e75d9 de4869d Author: Don Armstrong <don(a)donarmstrong.com> Date: Wed Mar 20 13:41:00 2013 -0700 Merge remote-tracking branch 'mikegabriel/proposal_upstream' into mike_patches commit c1e75d95c13f6eee442bbe0e383aa3944a2cbe3b Author: Don Armstrong <don(a)donarmstrong.com> Date: Wed Mar 20 13:37:20 2013 -0700 when we fail to commit to utf8, output the charset and data commit dda4ac413007e12639f709e8e1a41c3583e78e36 Author: Don Armstrong <don(a)donarmstrong.com> Date: Wed Mar 20 07:31:12 2013 -0700 add rebuild index support commit de4869db73405466eec3f35456231ee051b1cb3d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 20 12:07:42 2013 +0100 /debian/control: de-capitalize description synopsis lines commit 32c86fe1d577f9710bdc1edb34714780ea145d0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 19 11:48:56 2013 +0100 Pass param bug=<NNN> to bugreport.html call in bugreport.cgi. commit 69c0b42f8328d3fb131d7658872313d377a5acc3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:48:44 2013 +0100 Raise Standards to 3.9.4 (after fixing several lintian issues). commit ede5f340a093569596670be592d4aace355df05a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:36:27 2013 +0100 * Fix lintian issues: libdebbugs-perl: spelling-error-in-manpage for: + usr/share/man/man3/Debbugs::Recipients.3pm.gz + usr/share/man/man3/Debbugs::SOAP.3pm.gz + usr/share/man/man3/Debbugs::Status.3pm.gz commit 3b6ca55f3178b27eec3e96c430e541aa9e080791 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:42:48 2013 +0100 Fix lintian issues: debbugs source: debian-rules-makemaker-prefix-is-deprecated line 44, debian-rules-makemaker-prefix-is-deprecated line 56. commit b3380601fced230e566b5fee2f21db826f999f51 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:27:57 2013 +0100 Fix lintian issue: debbugs source: duplicate-in-relation-field in libdebbugs-perl depends: libtext-template-perl, libtext-template-perl. commit e2215900b43a05781a2ab0aa1394863f851c4701 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:14:01 2013 +0100 Switch to debian/source/format: 3.0 (native). commit 70959f30862c73643bbe2a6b62711ff742cc29f7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:13:01 2013 +0100 Fix lintian issues: debian-rules-missing-recommended-target build-arch, debian-rules-missing-recommended-target build-indep. commit d1cb3d4f7526a5103cffd722957bb7f8b323519e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:10:48 2013 +0100 Fix lintian issue: description-synopsis-starts-with-article, also: capitalize first letter in all description synopsis lines. commit 46bcc11ec89bfe72d7fa11fff0cb762b346b8a03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 18 11:08:52 2013 +0100 have a length < 0 (closes: #688344). * Fix spelling error in /debian/changelog. commit e21d955ffd42e6f59c67cd52681b782d40cf41a9 Author: Don Armstrong <don(a)donarmstrong.com> Date: Tue Mar 19 15:34:17 2013 -0700 add first work on rebuild index.db commit dd641f972d763dd79422ea216f4024dc3679e34c Author: Don Armstrong <don(a)donarmstrong.com> Date: Tue Mar 19 15:19:58 2013 -0700 write to bug closers in UTF-8 commit 09cf3ac4a9ef1c2fad6b3b5585ae65316960e837 Author: Don Armstrong <don(a)donarmstrong.com> Date: Mon Mar 18 10:42:15 2013 -0700 Fix double encoding of attachments (closes: #703300) ----------------------------------------------------------------------- Summary of changes: Debbugs/CGI/Bugreport.pm | 77 +++++++------- Debbugs/Control.pm | 6 +- Debbugs/Estraier.pm | 15 ++- Debbugs/Recipients.pm | 2 +- Debbugs/SOAP.pm | 2 +- Debbugs/Status.pm | 55 +++++++--- Debbugs/UTF8.pm | 47 +++++---- bin/debbugs-rebuild-index.db | 157 ++++++++++++++++++++++++++++ debian/changelog | 19 +++- debian/control | 7 +- debian/rules | 12 ++- debian/source/format | 1 + examples/debian/postpa/21bugclosers | 1 + html/bugs.css | 13 ++- t/01_pod.t | 4 +- t/{13_utf8_mail.t => 15_rebuild_indexdb.t} | 13 +-- templates/en_US/cgi/bugreport.tmpl | 2 +- 17 files changed, 324 insertions(+), 109 deletions(-) create mode 100755 bin/debbugs-rebuild-index.db create mode 100644 debian/source/format copy t/{13_utf8_mail.t => 15_rebuild_indexdb.t} (83%) The diff of changes is: diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm index b3f4ec6..d9a8744 100644 --- a/Debbugs/CGI/Bugreport.pm +++ b/Debbugs/CGI/Bugreport.pm @@ -148,10 +148,10 @@ sub display_entity { if ($_ eq 'From' and $param{avatars}) { my $libravatar_url = __libravatar_url(decode_rfc1522($head_field)); if (defined $libravatar_url and length $libravatar_url) { - push @headers,q(<img src=").$libravatar_url.qq(">\n); + push @headers,q(<img src=").$libravatar_url.qq(" alt="">\n); } } - push @headers, qq($_: ) . html_escape(decode_rfc1522($head_field))."\n"; + push @headers, qq(<div class="header">$_: ) . html_escape(decode_rfc1522($head_field))."</div>\n"; } print {$output} join(qq(), @headers); } else { @@ -172,7 +172,6 @@ sub display_entity { my $body = $entity->stringify_body; # this attachment has its own content type, so we must not # try to convert it to UTF-8 or do anything funky. - my @layers = PerlIO::get_layers($output); binmode($output,':raw'); print {$output} "Content-Type: $type"; my ($charset) = $head->get('Content-Type:') =~ m/charset\s*=\s*\"?([\w-]+)\"?/i; @@ -187,10 +186,10 @@ sub display_entity { print {$output} "\n"; my $decoder = MIME::Decoder->new($head->mime_encoding); $decoder->decode(IO::Scalar->new(\$body), $output); - if (grep {/utf8/} @layers) { - binmode($output,':utf8'); - } - return; + # we don't reset the layers here, because it makes no + # sense to add anything to the output handle after this + # point. + return(1); } elsif (not exists $param{att}) { my @dlargs = (msg=>$xmessage, att=>$#$attachments); @@ -206,26 +205,30 @@ sub display_entity { } } - return if not $param{outer} and $disposition eq 'attachment' and not exists $param{att}; - return unless ($type =~ m[^text/?] and - $type !~ m[^text/(?:html|enriched)(?:;|$)]) or - $type =~ m[^application/pgp(?:;|$)] or - $entity->parts; + return 0 if not $param{outer} and $disposition eq 'attachment' and not exists $param{att}; + return 0 unless (($type =~ m[^text/?] and + $type !~ m[^text/(?:html|enriched)(?:;|$)]) or + $type =~ m[^application/pgp(?:;|$)] or + $entity->parts); if ($entity->is_multipart) { my @parts = $entity->parts; foreach my $part (@parts) { - display_entity(entity => $part, - bug_num => $ref, - outer => 0, - msg_num => $xmessage, - output => $output, - attachments => $attachments, - terse => $param{terse}, - exists $param{msg}?(msg=>$param{msg}):(), - exists $param{att}?(att=>$param{att}):(), - exists $param{avatars}?(avatars=>$param{avatars}):(), - ); + my $raw_output = + display_entity(entity => $part, + bug_num => $ref, + outer => 0, + msg_num => $xmessage, + output => $output, + attachments => $attachments, + terse => $param{terse}, + exists $param{msg}?(msg=>$param{msg}):(), + exists $param{att}?(att=>$param{att}):(), + exists $param{avatars}?(avatars=>$param{avatars}):(), + ); + if ($raw_output) { + return $raw_output; + } # print {$output} "\n"; } } elsif ($entity->parts) { @@ -286,6 +289,7 @@ sub display_entity { print {$output} qq(<pre class="message">$body</pre>\n); } } + return 0; } @@ -314,19 +318,20 @@ sub handle_email_message{ $parser->output_to_core(1); my $entity = $parser->parse_data( $email); my @attachments = (); - display_entity(entity => $entity, - bug_num => $param{ref}, - outer => 1, - msg_num => $param{msg_num}, - output => $output_fh, - attachments => \@attachments, - terse => $param{terse}, - exists $param{msg}?(msg=>$param{msg}):(), - exists $param{att}?(att=>$param{att}):(), - exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(), - exists $param{avatars}?(avatars=>$param{avatars}):(), - ); - return decode_utf8($output); + my $raw_output = + display_entity(entity => $entity, + bug_num => $param{ref}, + outer => 1, + msg_num => $param{msg_num}, + output => $output_fh, + attachments => \@attachments, + terse => $param{terse}, + exists $param{msg}?(msg=>$param{msg}):(), + exists $param{att}?(att=>$param{att}):(), + exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(), + exists $param{avatars}?(avatars=>$param{avatars}):(), + ); + return $raw_output?$output:decode_utf8($output); } =head2 handle_record diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 0390ba7..44d0062 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -2663,7 +2663,7 @@ Handles all setting of summary fields If summary is undef, unsets the summary -If summary is 0, sets the summary to the first paragraph contained in +If summary is 0 or -1, sets the summary to the first paragraph contained in the message passed. If summary is a positive integer, sets the summary to the message specified. @@ -2751,7 +2751,7 @@ sub _summary { elsif ($param{$cmd} =~ /^\d+$/) { my $log = []; my @records = Debbugs::Log::read_log_records(bug_num => $param{bug}); - if ($param{$cmd} == 0) { + if ($param{$cmd} == 0 or $param{$cmd} == -1) { $log = $param{message}; $summary_msg = @records + 1; } @@ -2785,7 +2785,7 @@ sub _summary { } # skip a paragraph if it looks like it's control or # pseudo-headers - if ($line =~ m{^\s*(?:Package|Source|Version|User|Tag|Severity)\:\s+\S}xi or #pseudo headers + if ($line =~ m{^\s*(?:Package|Source|Version|User|Tag|Severity|Control)\:\s+\S}xi or #pseudo headers $line =~ m{^(?:package:?|(?:no|)owner|severity|tags?|summary| #control \#|reopen|close|(?:not|)(?:fixed|found)|clone| debug|(?:not|)forwarded|priority| diff --git a/Debbugs/Estraier.pm b/Debbugs/Estraier.pm index e3c89a1..5987fe9 100644 --- a/Debbugs/Estraier.pm +++ b/Debbugs/Estraier.pm @@ -30,12 +30,11 @@ use strict; use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT); use base qw(Exporter); use Debbugs::Log; -#use Params::Validate; use Search::Estraier; -use Date::Manip; use Debbugs::Common qw(getbuglocation getbugcomponent make_list); use Debbugs::Status qw(readbug); use Debbugs::MIME qw(parse); +use Encode qw(encode_utf8); BEGIN{ ($VERSION) = q$Revision: 1.3 $ =~ /^Revision:\s+([^\s+])/; @@ -121,7 +120,7 @@ sub add_bug_message{ $doc = new Search::Estraier::Document if not defined $doc; my $message = parse($bug_message); - $doc->add_text(join("\n",make_list(values %{$message}))); + $doc->add_text(encode_utf8(join("\n",make_list(values %{$message})))); # * @id : the ID number determined automatically when the document is registered. # * @uri : the location of a document which any document should have. @@ -140,17 +139,17 @@ sub add_bug_message{ my @attr = qw(status subject date submitter package tags severity); # parse the date my ($date) = $bug_message =~ /^Date:\s+(.+?)\s*$/mi; - $doc->add_attr('@cdate' => $date) if defined $date; + $doc->add_attr('@cdate' => encode_utf8($date)) if defined $date; # parse the title my ($subject) = $bug_message =~ /^Subject:\s+(.+?)\s*$/mi; - $doc->add_attr('@title' => $subject) if defined $subject; + $doc->add_attr('@title' => encode_utf8($subject)) if defined $subject; # parse the author my ($author) = $bug_message =~ /^From:\s+(.+?)\s*$/mi; - $doc->add_attr('@author' => $author) if defined $author; + $doc->add_attr('@author' => encode_utf8($author)) if defined $author; # create the uri - $doc->add_attr('@uri' => $uri); + $doc->add_attr('@uri' => encode_utf8($uri)); foreach my $attr (@attr) { - $doc->add_attr($attr => $status->{$attr}) if defined $status->{$attr}; + $doc->add_attr($attr => encode_utf8($status->{$attr})) if defined $status->{$attr}; } print STDERR "adding $uri\n" if $DEBUG; # Try a bit harder if estraier is returning timeouts diff --git a/Debbugs/Recipients.pm b/Debbugs/Recipients.pm index 47c6485..ae739e9 100644 --- a/Debbugs/Recipients.pm +++ b/Debbugs/Recipients.pm @@ -245,7 +245,7 @@ Using the recipient hashref, determines the set of recipients. If you specify one of C<bcc>, C<cc>, or C<to>, you will receive only a LIST of recipients which the main should be Bcc'ed, Cc'ed, or To'ed respectively. By default, a LIST with keys bcc, cc, and to is returned -with ARRAYREF values correponding to the users to whom a message +with ARRAYREF values corresponding to the users to whom a message should be sent. =over diff --git a/Debbugs/SOAP.pm b/Debbugs/SOAP.pm index c1fc85f..f87581e 100644 --- a/Debbugs/SOAP.pm +++ b/Debbugs/SOAP.pm @@ -343,7 +343,7 @@ architectures are at which versions. =back -This function correponds to L<Debbugs::Packages::get_versions> +This function corresponds to L<Debbugs::Packages::get_versions> =cut diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm index 9c9551b..bf3d2ab 100644 --- a/Debbugs/Status.pm +++ b/Debbugs/Status.pm @@ -70,6 +70,7 @@ BEGIN{ qw(removefoundversions removefixedversions) ], hook => [qw(bughook bughook_archive)], + indexdb => [qw(generate_index_db_line)], fields => [qw(%fields)], ); @EXPORT_OK = (); @@ -207,6 +208,7 @@ sub read_bug{ $log = $status; $log =~ s/\.summary$/.log/; ($location) = $status =~ m/(db-h|db|archive)/; + ($param{bug}) = $status =~ m/(\d+)\.summary$/; } if ($param{lock}) { filelock("$config{spool_dir}/lock/$param{bug}",exists $param{locks}?$param{locks}:()); @@ -274,7 +276,7 @@ sub read_bug{ my $status_modified = (stat($status))[9]; # Add log last modified time - $data{log_modified} = (stat($log))[9]; + $data{log_modified} = (stat($log))[9] // (stat("${log}.gz"))[9]; $data{last_modified} = max($status_modified,$data{log_modified}); $data{location} = $location; $data{archived} = (defined($location) and ($location eq 'archive'))?1:0; @@ -655,7 +657,7 @@ sub makestatus { Writes the bug status and summary files out. -Skips writting out a status file if minversion is 2 +Skips writing out a status file if minversion is 2 Does not call bughook if disablebughook is true. @@ -773,7 +775,7 @@ exactly are removed. Otherwise, all versions matching the version number are removed. Currently $package and $isbinary are entirely ignored, but accepted -for backwards compatibilty. +for backwards compatibility. =cut @@ -1599,6 +1601,39 @@ sub isstrongseverity { return grep { $_ eq $severity } @{$config{strong_severities}}; } +=head1 indexdb + +=head2 generate_index_db_line + + my $data = read_bug(bug => $bug, + location => $initialdir); + # generate_index_db_line hasn't been written yet at all. + my $line = generate_index_db_line($data); + +Returns a line for a bug suitable to be written out to index.db. + +=cut + +sub generate_index_db_line { + my ($data,$bug) = @_; + + # just in case someone has given us a split out data + $data = join_status_fields($data); + + my $whendone = "open"; + my $severity = $config{default_severity}; + (my $pkglist = $data->{package}) =~ s/[,\s]+/,/g; + $pkglist =~ s/^,+//; + $pkglist =~ s/,+$//; + $whendone = "forwarded" if defined $data->{forwarded} and length $data->{forwarded}; + $whendone = "done" if defined $data->{done} and length $data->{done}; + $severity = $data->{severity} if length $data->{severity}; + return sprintf "%s %d %d %s [%s] %s %s\n", + $pkglist, $data->{bug_num}//$bug, $data->{date}, $whendone, + $data->{originator}, $severity, $data->{keywords}; +} + + =head1 PRIVATE FUNCTIONS @@ -1681,19 +1716,7 @@ sub bughook { my $data = $bugs_temp{$bug}; appendfile("$config{spool_dir}/debbugs.trace","$type $bug\n",makestatus($data, 1)); - my $whendone = "open"; - my $severity = $config{default_severity}; - (my $pkglist = $data->{package}) =~ s/[,\s]+/,/g; - $pkglist =~ s/^,+//; - $pkglist =~ s/,+$//; - $whendone = "forwarded" if defined $data->{forwarded} and length $data->{forwarded}; - $whendone = "done" if defined $data->{done} and length $data->{done}; - $severity = $data->{severity} if length $data->{severity}; - - my $k = sprintf "%s %d %d %s [%s] %s %s\n", - $pkglist, $bug, $data->{date}, $whendone, - $data->{originator}, $severity, $data->{keywords}; - $bugs{$bug} = $k; + $bugs{$bug} = generate_index_db_line($data,$bug); } update_realtime("$config{spool_dir}/index.db.realtime", %bugs); diff --git a/Debbugs/UTF8.pm b/Debbugs/UTF8.pm index 45da58f..bc3a0fa 100644 --- a/Debbugs/UTF8.pm +++ b/Debbugs/UTF8.pm @@ -143,10 +143,9 @@ sub decode_utf8_safely{ =cut -our %iconv_converters; - sub convert_to_utf8 { - my ($data,$charset) = @_; + my ($data,$charset,$internal_call) = @_; + $internal_call //= 0; if (is_utf8($data)) { cluck("utf8 flag is set when calling convert_to_utf8"); return $data; @@ -155,30 +154,36 @@ sub convert_to_utf8 { if ($charset eq 'RAW') { croak("Charset must not be raw when calling convert_to_utf8"); } - if (not defined $iconv_converters{$charset}) { - eval { - $iconv_converters{$charset} = Text::Iconv->new($charset,"UTF-8") or - die "Unable to create converter for '$charset'"; - }; - if ($@) { - warn $@; - # We weren't able to create the converter, so use Encode - # instead - return __fallback_convert_to_utf8($data,$charset); - } - } - if (not defined $iconv_converters{$charset}) { - warn "The converter for $charset wasn't created properly somehow!"; + my $iconv_converter; + eval { + $iconv_converter = Text::Iconv->new($charset,"UTF-8") or + die "Unable to create converter for '$charset'"; + }; + if ($@) { + return undef if $internal_call; + warn $@; + # We weren't able to create the converter, so use Encode + # instead return __fallback_convert_to_utf8($data,$charset); } - my $converted_data = $iconv_converters{$charset}->convert($data); + my $converted_data = $iconv_converter->convert($data); # if the conversion failed, retval will be undefined or perhaps # -1. - my $retval = $iconv_converters{$charset}->retval(); + my $retval = $iconv_converter->retval(); if (not defined $retval or $retval < 0 ) { - warn "failed to convert to utf8"; + # try iso8559-1 first + if (not $internal_call) { + my $call_back_data = convert_to_utf8($data,'ISO8859-1',1); + # if there's an Ã (0xC3), it's probably something + # horrible, and we shouldn't try to convert it. + if (defined $call_back_data and $call_back_data !~ /\x{C3}/) { + warn "failed to convert to utf8 (charset: $charset, data: $data), but succeeded with ISO8859-1: ".encode_utf8($call_back_data); + return $call_back_data; + } + } + warn "failed to convert to utf8 (charset: $charset, data: $data)"; # Fallback to encode, which will probably also fail. return __fallback_convert_to_utf8($data,$charset); } @@ -199,7 +204,7 @@ sub __fallback_convert_to_utf8 { $charset //= 'utf8'; my $result; eval { - $result = decode($charset,$data); + $result = decode($charset,$data,0); }; if ($@) { warn "Unable to decode charset; '$charset' and '$data': $@"; diff --git a/bin/debbugs-rebuild-index.db b/bin/debbugs-rebuild-index.db new file mode 100755 index 0000000..c44bc32 --- /dev/null +++ b/bin/debbugs-rebuild-index.db @@ -0,0 +1,157 @@ +#! /usr/bin/perl +# debbugs-rebuild-index.db is part of debbugs, and is released +# under the terms of the GPL version 2, or any later version, at your +# option. See the file README and COPYING for more information. +# Copyright 2012 by Don Armstrong <don(a)donarmstrong.com>. + + +use warnings; +use strict; + +use Getopt::Long qw(:config no_ignore_case); +use Pod::Usage; + +=head1 NAME + +debbugs-rebuild-index.db -- rebuild Debbug's index.db + +=head1 SYNOPSIS + +debbugs-rebuild-index.db [options] + + Options: + --spool-dir debbugs spool directory + --debug, -d debugging level (Default 0) + --help, -h display this help + --man, -m display manual + +=head1 OPTIONS + +=over + +=item B<--spool-dir> + +Debbugs spool directory; defaults to the value configured in the +debbugs configuration file. + +=item B<--debug, -d> + +Debug verbosity. + +=item B<--help, -h> + +Display brief useage information. + +=item B<--man, -m> + +Display this manual. + +=back + +=head1 EXAMPLES + +Rebuild the index.db for db-h. + + debbugs-rebuild-index.db; + +Rebuild the index.db for archive + + debbugs-rebuild-index.db archive; + + +=cut + + +use vars qw($DEBUG); + +use Debbugs::Common qw(checkpid lockpid get_hashname getparsedaddrs getbugcomponent make_list); +use Debbugs::Config qw(:config); +use Debbugs::Status qw(read_bug split_status_fields generate_index_db_line); + +my %options = (debug => 0, + help => 0, + man => 0, + verbose => 0, + quiet => 0, + quick => 0, + service => 'debbugs', + ); + + +GetOptions(\%options, + 'quick|q', + 'service|s', + 'sysconfdir|c', + 'spool_dir|spool-dir=s', + 'debug|d+','help|h|?','man|m'); + +pod2usage() if $options{help}; +pod2usage({verbose=>2}) if $options{man}; + +$DEBUG = $options{debug}; + +my @USAGE_ERRORS; +$options{verbose} = $options{verbose} - $options{quiet}; + +pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS; + +if (exists $options{spool_dir} and defined $options{spool_dir}) { + $config{spool_dir} = $options{spool_dir}; +} +chdir($config{spool_dir}) or die "chdir $config{spool_dir} failed: $!"; + +my $verbose = $options{debug}; + +my $initialdir = "db-h"; + +if (defined $ARGV[0] and $ARGV[0] eq "archive") { + $initialdir = "archive"; +} + +if (not lockpid($config{spool_dir}.'/lock/debbugs-rebuild-index.db')) { + print STDERR "Another debbugs-rebuild-index.db is running; stopping\n"; + exit 1; +} + +my $fh_type = $initialdir; +# if initaldir is db-h, the file is db. +$fh_type = 'db' if $initialdir eq 'db-h'; + +my $file = "index.${fh_type}.realtime"; +my $idx_rebuild = IO::File->new($file.'.rebuild','w') + or die "Couldn't open ${file}.rebuild: $!"; + + +my @dirs = ($initialdir); +my $cnt = 0; +my %bugs; +while (my $dir = shift @dirs) { + printf "Doing dir %s ...\n", $dir if $verbose; + + opendir(DIR, "$dir/.") or die "opendir $dir: $!"; + my @subdirs = readdir(DIR); + closedir(DIR); + + my @list = map { m/^(\d+)\.summary$/?($1):() } @subdirs; + push @dirs, map { m/^(\d+)$/ && -d "$dir/$1"?("$dir/$1"):() } @subdirs; + + for my $bug (@list) { + print "Up to $cnt bugs...\n" if (++$cnt % 100 == 0 && $verbose); + my $stat = stat(getbugcomponent($bug,'summary',$initialdir)); + if (not defined $stat) { + print STDERR "Unable to stat $bug $!\n"; + next; + } + my $data = read_bug(bug => $bug, + location => $initialdir); + my $line = generate_index_db_line($data); + $bugs{$bug} = $line; + } +} +binmode($idx_rebuild,':raw:encoding(UTF-8)'); +print {$idx_rebuild} $bugs{$_} foreach sort {$a <=> $b} keys %bugs; +close($idx_rebuild); +rename("$file.rebuild", $file); + + +__END__ diff --git a/debian/changelog b/debian/changelog index 14a0d66..e2ab47d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low * Fix failure to forcibly merge/merge when found/fixed is not qualified (closes: #670456). Thanks to Jonathan Nieder and Bernhard Schmidt. * Add libravatar support. + * Fix double encoding of attachments (closes: #703300) [Thanks to Arnout Engelen: ] * Add Homepage (closes: #670555). @@ -52,9 +53,25 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low a site admin aware of its existence (closes: #688345). * Make sure that mails to gSubscriptionDomain and gBugSubscriptionDomain are only sent out if the variables in config are defined and - have a lenght < 0 (closes: #688344). + have a length < 0 (closes: #688344). * Use locale independent date format for mail processing and service mail generation (closes: #688745). + * Fix spelling error in /debian/changelog. + * Fix lintian issue: description-synopsis-starts-with-article. + * Fix lintian issues: debian-rules-missing-recommended-target build-arch, + debian-rules-missing-recommended-target build-indep. + * Switch to debian/source/format: 3.0 (native). + * Fix lintian issue: debbugs source: duplicate-in-relation-field in + libdebbugs-perl depends: libtext-template-perl, libtext-template-perl. + * Fix lintian issues: debbugs source: + debian-rules-makemaker-prefix-is-deprecated line 44, + debian-rules-makemaker-prefix-is-deprecated line 56. + * Fix lintian issues: libdebbugs-perl: spelling-error-in-manpage for: + + usr/share/man/man3/Debbugs::Recipients.3pm.gz + + usr/share/man/man3/Debbugs::SOAP.3pm.gz + + usr/share/man/man3/Debbugs::Status.3pm.gz + * Raise Standards to 3.9.4 (after fixing several lintian issues). + * Pass param bug=<NNN> to bugreport.html call in bugreport.cgi. -- Don Armstrong <don(a)debian.org> Wed, 25 Aug 2010 01:57:38 -0700 diff --git a/debian/control b/debian/control index f0f5d61..d8f19b5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Debbugs developers <debian-debbugs(a)lists.debian.org> Uploaders: Colin Watson <cjwatson(a)debian.org>, Don Armstrong <don(a)debian.org> -Standards-Version: 3.8.2 +Standards-Version: 3.9.4 Vcs-Browser: http://bugs.debian.org/debbugs-source/mainline Vcs-Git: http://bugs.debian.org/debbugs-source/debbugs.git Build-Depends: debhelper (>= 5) @@ -25,7 +25,7 @@ Depends: libdebbugs-perl, Recommends: debbugs-web Suggests: spamassassin (>= 3.0), libcgi-alert-perl -Description: The bug tracking system based on the active Debian BTS +Description: bug tracking system based on the active Debian BTS Debian has a bug tracking system which files details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. The system is mainly controlled by @@ -44,7 +44,6 @@ Depends: libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, libcgi-simple-perl, libparams-validate-perl, libtext-template-perl, libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl, - libtext-template-perl Section: perl Description: modules used by the active Debian BTS Debian has a bug tracking system which files details of bugs reported by @@ -77,7 +76,7 @@ Depends: ${misc:Depends}, libdebbugs-perl, debbugs-web, libconfig-simple-perl, libuser-perl, rsync, libhttp-server-simple-perl, libnet-server-perl -Description: run and maintains a local mirror of the Debian BTS +Description: Run and maintains a local mirror of the Debian BTS Debian has a bug tracking system which files details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. The system is diff --git a/debian/rules b/debian/rules index c348379..7bdd341 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,13 @@ DEST_DIR := $(CURDIR)/debian/tmp PERL ?= /usr/bin/perl -build: build-stamp +build: build-arch build-indep + +build-arch: +# nothing to do, as there aren't any architecture-dependent packages + +build-indep: build-stamp + build-stamp: # Call the test suite $(PERL) Makefile.PL INSTALLDIRS=vendor @@ -35,7 +41,7 @@ install-stamp: build dh_clean -k dh_installdirs $(MAKE) install_mostfiles DESTDIR=$(DEST_DIR) - $(MAKE) -f Makefile.perl install PREFIX=$(DEST_DIR)/usr + $(MAKE) -f Makefile.perl install DESTDIR=$(DEST_DIR) touch $@ binary-arch: @@ -47,7 +53,7 @@ binary-indep: build install dh_clean -k dh_installdirs $(MAKE) install_mostfiles DESTDIR=$(DEST_DIR) - $(MAKE) -f Makefile.perl install PREFIX=$(DEST_DIR)/usr + $(MAKE) -f Makefile.perl install DESTDIR=$(DEST_DIR) dh_install --sourcedir=debian/tmp --fail-missing dh_installdocs dh_installchangelogs diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f67427 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) \ No newline at end of file diff --git a/examples/debian/postpa/21bugclosers b/examples/debian/postpa/21bugclosers index 382b779..dfcc44a 100755 --- a/examples/debian/postpa/21bugclosers +++ b/examples/debian/postpa/21bugclosers @@ -39,6 +39,7 @@ my %bugclosers = count_bugs(function => sub { open BUGCLOSERS, '> /org/bugs.debian.org/www/stats/bugclosers.txt.new' or die "can't open bugclosers.txt.new: $!"; +binmode(BUGCLOSERS,':raw:encoding(UTF-8)'); for my $closer (sort { $bugclosers{$a} <=> $bugclosers{$b} } keys %bugclosers) { printf BUGCLOSERS "%4d %s\n", $bugclosers{$closer}, $closer or die "can't write to bugclosers.txt.new: $!"; diff --git a/html/bugs.css b/html/bugs.css index c251cea..9019b9d 100644 --- a/html/bugs.css +++ b/html/bugs.css @@ -99,7 +99,7 @@ a.submitter:hover, a.submitter:visited:hover { pre.message { font-family: monospace; - padding-top: 0; + padding-top: 8px; margin-top: 0; border-top: 0; } @@ -133,6 +133,15 @@ div.headers { overflow: auto; } +div.header { + font-family: sans-serif; + font-size: 95%; + color: #3c3c3c; + padding: 0px; + line-height: 120%; + margin: 0px; +} + div.headers p { font-family: sans-serif; font-size: 95%; @@ -146,7 +155,7 @@ div.headers img { float: right; } -span.header { +span.headerfield { font-weight: bold }; diff --git a/t/01_pod.t b/t/01_pod.t index 8fb590f..2f1d2df 100644 --- a/t/01_pod.t +++ b/t/01_pod.t @@ -2,4 +2,6 @@ use Test::More; eval "use Test::Pod 1.00"; plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; -all_pod_files_ok(all_pod_files('.')); +all_pod_files_ok(grep {$_ !~ /[~#]$/} all_pod_files((-e 'blib'?'blib':(qw(Debbugs Mail))), + (qw(bin cgi scripts)) + )); diff --git a/t/13_utf8_mail.t b/t/15_rebuild_indexdb.t similarity index 83% copy from t/13_utf8_mail.t copy to t/15_rebuild_indexdb.t index be6b6c6..a3036ec 100644 --- a/t/13_utf8_mail.t +++ b/t/15_rebuild_indexdb.t @@ -1,7 +1,6 @@ # -*- mode: cperl;-*- -# $Id: 05_mail.t,v 1.1 2005/08/17 21:46:17 don Exp $ -use Test::More tests => 13; +use Test::More tests => 9; use warnings; use strict; @@ -123,15 +122,7 @@ $SD_SIZE = $sendmail_dir, 'control(a)bugs.something messages appear to have been sent out properly'); # now we need to check to make sure the control message was processed without errors -ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed: Munging a bug")) == 0, - 'control(a)bugs.something message was parsed without errors'); # now we need to check to make sure that the control message actually did anything # This is an eval because $ENV{DEBBUGS_CONFIG_FILE} isn't set at BEGIN{} time eval "use Debbugs::Status qw(read_bug writebug);"; -my $status = read_bug(bug=>1); -ok($status->{subject} eq 'ütﬀ8 title encoding test','bug 1 retitled'); -ok($status->{severity} eq 'wishlist','bug 1 wishlisted'); -ok(system('sh','-c','[ $(egrep "retitle.*encoding test" '.$spool_dir.'/db-h/01/1.log|grep -v "=C3=BCt=EF=AC=808"|wc -l) -eq 0 ]') == 0, - 'Control messages escaped properly'); -ok(system('sh','-c',encode_utf8('grep -q "föoﬀ(a)bugs.something" '.$spool_dir.'/index.db'))==0, - 'index.db not double escaped'); +ok(system('bin/debbugs-rebuild-index.db')==0,'debbugs-rebuild-index seems to work'); diff --git a/templates/en_US/cgi/bugreport.tmpl b/templates/en_US/cgi/bugreport.tmpl index 070005a..66a1ca2 100644 --- a/templates/en_US/cgi/bugreport.tmpl +++ b/templates/en_US/cgi/bugreport.tmpl @@ -43,7 +43,7 @@ function toggle_infmessages() } {$log} <hr> -Send a report that <a href="http://{$config{cgi_domain}}/bugspam.cgi">this bug log contains spam</a>. +Send a report that <a href="http://{$config{cgi_domain}}/bugspam.cgi?bug={$bug_num}">this bug log contains spam</a>. <hr> {include(q(html/html_tail))} </body> hooks/post-receive -- debbugs.git (debbugs upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "debbugs.git" (debbugs upstream project).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-16-g3f7c053
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, release/4.0.0.x has been updated via 3f7c053a58aa2e38c93935c9ac3ac570896e6506 (commit) from 275a8022ed3ea2fab21329f7ea2f19aa07a19187 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f7c053a58aa2e38c93935c9ac3ac570896e6506 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:24:44 2013 +0200 changelog: add closure for issue #200 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 359a2f9..470a502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-15-g275a802
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, release/4.0.0.x has been updated via 275a8022ed3ea2fab21329f7ea2f19aa07a19187 (commit) from 8f2eb0d783eece54db114e73ad90fe3666a46b7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 275a8022ed3ea2fab21329f7ea2f19aa07a19187 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:23:57 2013 +0200 Revert "changelog update: add closure for issue #200" This reverts commit 8f2eb0d783eece54db114e73ad90fe3666a46b7c. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 470a502..359a2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). + not present. /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e6de5fb..45b3ba5 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,7 +135,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_NONSSH_PORTS=$( +USED_PORTS=$( + "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -143,12 +144,12 @@ USED_NONSSH_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -163,7 +164,6 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" - USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,6 +209,7 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" +ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -276,9 +277,6 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi -# link the session.log on /tmp into the session directory -ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" - X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-151-gc66561b
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, master has been updated via c66561b7f609220f2d39cfb240e294246d3016e1 (commit) from 7b6b8c72794d71a92bee5cea1ab301afddfe6782 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c66561b7f609220f2d39cfb240e294246d3016e1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:23:01 2013 +0200 Revert "changelog update: add closure for issue #200" This reverts commit 7b6b8c72794d71a92bee5cea1ab301afddfe6782. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e30e866..825de8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,7 +63,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). + not present. /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5569116..5b97fb4 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,7 +135,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_NONSSH_PORTS=$( +USED_PORTS=$( + "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -143,12 +144,12 @@ USED_NONSSH_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -163,7 +164,6 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" - USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,6 +209,7 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" +ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -276,9 +277,6 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi -# link the session.log on /tmp into the session directory -ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" - X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-152-g8fd306d
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, master has been updated via 8fd306d77cd3189d3084659617cb9d31b1d8e89f (commit) from c66561b7f609220f2d39cfb240e294246d3016e1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8fd306d77cd3189d3084659617cb9d31b1d8e89f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:24:44 2013 +0200 changelog: add closure for issue #200 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 825de8b..e30e866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,7 +63,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-150-g7b6b8c7
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, master has been updated via 7b6b8c72794d71a92bee5cea1ab301afddfe6782 (commit) from ea2dc32520bec21f39d05284270bb6f6b6b46e08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7b6b8c72794d71a92bee5cea1ab301afddfe6782 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:18:51 2013 +0200 changelog update: add closure for issue #200 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 825de8b..e30e866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,7 +63,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5b97fb4..5569116 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,8 +135,7 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_PORTS=$( - "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; +USED_NONSSH_PORTS=$( "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -144,12 +143,12 @@ USED_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -164,6 +163,7 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" + USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,9 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +# link the session.log on /tmp into the session directory +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.1-14-g8f2eb0d
by git-admin＠x2go.org 14 May '13

14 May '13

The branch, release/4.0.0.x has been updated via 8f2eb0d783eece54db114e73ad90fe3666a46b7c (commit) from bad455edefdce83da6a1f3b42e6626030e8b82d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8f2eb0d783eece54db114e73ad90fe3666a46b7c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 14 12:18:51 2013 +0200 changelog update: add closure for issue #200 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2goserver/bin/x2gostartagent | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 359a2f9..470a502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (4.0.0.2): - Use make_path from File::Path in x2godbadmin to create user directory if - not present. + not present. (Fixes: #200). /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 45b3ba5..e6de5fb 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -135,8 +135,7 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` #Get all used in system ports from X2Go database and ss output ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); -USED_PORTS=$( - "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; +USED_NONSSH_PORTS=$( "$ss" -lnt | perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; ); @@ -144,12 +143,12 @@ USED_PORTS=$( while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - + #Test if the session is already in use. nxagent uses 6000+DISPLAY to open a port. Therefore this must be tested, too. NX_PORT=$(($X2GO_PORT + 6000)) if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] || - grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then + grep -q "|${NX_PORT}|" <<<$USED_NONSSH_PORTS ; then OUTPUT="XXX" else SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`" @@ -164,6 +163,7 @@ done while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do OUTPUT="" + USED_PORTS=`echo -e "$($X2GO_LIB_PATH/x2gogetports \"$HOSTNAME\")\n$USED_NONSSH_PORTS"` while [ "$OUTPUT" != "inserted" ]; do SSH_PORT=$(($SSH_PORT + 1)) @@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}") chmod -f 0700 $(dirname "${SESSION_LOG}") touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" @@ -277,6 +276,9 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi +# link the session.log on /tmp into the session directory +ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

page changed: x2gobroker:inifilebackend
by wiki-admin＠x2go.org 12 May '13

12 May '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/05/12 22:47 Browser : Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0 IP-Address : 176.6.152.202 Hostname : 176.6.152.202 Old Revision: http://wiki.x2go.org/doku.php/x2gobroker:inifilebackend?rev=1368397585 New Revision: http://wiki.x2go.org/doku.php/x2gobroker:inifilebackend Edit Summary: User : sunweaver @@ -3,5 +3,7 @@ The default version of the ''/etc/x2go/broker/x2gobroker-sessionprofiles.conf'' configuration file can be viewed [[http://code.x2go.org/gitweb?p=x2gobroker.git;a=blob;f=etc/broker/x2gobroker…]] + + ===== Basic Configuration File ===== The file format is the INI file format. It falls in to a [DEFAULT] section and one or more session profile sections. A minimal setup could look like this. <file> @@ -22,4 +24,66 @@ height=768 </file> Note that every X2Go Client parameter not given here gets filled in from a [[http://code.x2go.org/gitweb?p=x2gobroker.git;a=blob;f=x2gobroker/defaults.p… default configuration]]. + + ===== Filtering through Access Control List ===== + + If a user has been successfully authenticated against the X2Go Session Broker (or a user name has been given via the http request for cases where ''check-credentials'' in ''x2gobroker.conf'' is set to ''false'') you can use the user's UID, GID and the client address from that the user connects to filter out session profiles. + + <file> + [DEFAULT] + command=XFCE + fullscreen=true + + [staff-server] + host=x2go-staff.intern + acl-groups-allow=staff,admins + acl-groups-deny=ALL + acl-any-order=deny-allow + + [student-server] + host=x2go-student-01.intern + acl-groups-allow=students,admins + acl-groups-deny=ALL + acl-any-order=deny-allow + + [admin-server] + host=x2go-admin.intern + fullscreen=false + width=1280 + height=768 + acl-groups-allow=admins + acl-groups-deny=ALL + acl-any-order=deny-allow + </file> + + ==== List of ACL rules ==== + + The ACL rules work very similar to Apache ACL rules (allow, deny statements in ''apache2.conf''). + + To set the order (deny, allow vs. allow, deny), use this parameter + + * ''acl-any-order = {deny-allow|allow-deny}'' (apply order to any ACL) + * ''acl-users-order = {deny-allow|allow-deny}'' (apply order to user ACLs only) + * ''acl-groups-order = {deny-allow|allow-deny}'' (apply order to group ACLs only) + * ''acl-clients-order = {deny-allow|allow-deny}'' (apply order to client ACLs only) + + Furthermore, an aid for selecting the correct order (deny-allow vs. allow-deny): + + **User ACLs:** + + * ''acl-users-allow = <user1>, <user2>, ..., <userN>'' + * ''acl-users-deny = ALL'' + + **Group ACLs:** + + * ''acl-groups-allow = <group1>, <group2>, ..., <groupN>'' + * ''acl-groups-deny = ALL'' + + **Client ACLs:** + + * ''acl-clients-allow = <subnet-or-ip>, <or-dns-hostname> + * ''acl-clients-deny = ALL'' + + + -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013