summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--captcha-2.3-24pre.patch262
-rw-r--r--captcha-2.3.nofont.tar.gzbin0 -> 20477 bytes
-rw-r--r--php-captchaphp.spec144
4 files changed, 410 insertions, 0 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/captcha-2.3-24pre.patch b/captcha-2.3-24pre.patch
new file mode 100644
index 0000000..ac64397
--- /dev/null
+++ b/captcha-2.3-24pre.patch
@@ -0,0 +1,262 @@
+diff -Naur captcha-2.3.orig/captcha.php captcha-2.3.new/captcha.php
+--- captcha-2.3.orig/captcha.php 2011-04-12 04:46:35.000000000 +0200
++++ captcha-2.3.new/captcha.php 2011-05-03 14:26:36.221434902 +0200
+@@ -4,7 +4,7 @@
+ title: Easy_CAPTCHA
+ description: highly configurable, user-friendly and accessible CAPTCHA
+ version: 2.3
+- author: milki
++ author: mario <xmilky@@gmail::com>
+ url: http://freshmeat.net/projects/captchaphp
+ config:
+ <const name="CAPTCHA_PERSISTENT" value="1" type="boolean" title="persistent cookie" description="sets a cookie after user successfully solved it, spares further captchas for a few days" />
+@@ -99,9 +99,16 @@
+ @define("CAPTCHA_BASE_URL", (empty($_SERVER['HTTPS'])? "http": "https") . "://$_SERVER[SERVER_NAME]:$_SERVER[SERVER_PORT]/" . substr(realpath(__FILE__), strlen(realpath($_SERVER["DOCUMENT_ROOT"]))));
+
+ #-- texts
+-@define("CAPTCHA_PROMPT_TEXT", 'please enter the letters you recognize in the CAPTCHA image to the left');
++@define("CAPTCHA_PROMPT_TEXT", 'Please enter the letters you recognize in the CAPTCHA image to the left.');
+ @define("CAPTCHA_WHATIS_TEXT", 'What is %s = ');
+-@define("CAPTCHA_REDRAW_TEXT", 'click on image to redraw');
++@define("CAPTCHA_REDRAW_TEXT", 'Click on image to redraw.');
++# error messages (not usually seen by users)
++@define("CAPTCHA_ERROBJ_TEXT", 'Invalid object created.');
++@define("CAPTCHA_ERRSAVE_TEXT", 'Storing of captcha_id and session data was unsuccessful.');
++@define("CAPTCHA_ERRID_TEXT", 'No ->id present.');
++@define("CAPTCHA_ERRCREA_TEXT", 'No ->created timestamp.');
++@define("CAPTCHA_NOGD_TEXT", 'PHP setup lacks GD. No image drawing is possible, CAPTCHA won\'t function.');
++@define("CAPTCHA_ERRINVREQ_TEXT", 'captcha error: request invalid (wrong storage id) / or expired');
+
+
+
+@@ -161,13 +168,14 @@
+ }
+ }
+
++
+
+ #-- create solutions
+ function generate() {
+
+ #-- init
+ srand(microtime() + time()/2 - 21017);
+- if ($this->id) { $this->prev[] = $this->id; }
++ if (!empty($this->id)) { $this->prev[] = $this->id; }
+ $this->id = $this->new_id();
+
+ #-- meta informations
+@@ -214,12 +222,12 @@
+
+ #-- examine if captcha data is fresh
+ function is_valid() {
+- return isset($this->id) && ($this->created)
++ return isset($this->id) && !empty($this->created)
+ && ($this->expires > time())
+ && ($this->tries > 0)
+ && ($this->failures < 500)
+ && ($this->passed < $this->maxpasses)
+- || $this->delete() || $this->log("is_valid", "EXPIRED", "and deleted") && false;
++ || $this->log("is_valid", "EXPIRED", "and deleted") && $this->delete() && false;
+ }
+
+
+@@ -236,7 +244,7 @@
+ #-- failure
+ if ((0 >= $this->tries--) || !$this->is_valid()) {
+ // log, this is either a frustrated user or a bot knocking
+- $this->log("::solved", "INVALID", "tries exhausted ($this->tries) or expired(?) captcha");
++ $this->log("::solved", "INVALID", "tries exhausted ({$this->tries}) or expired(?) captcha");
+ }
+
+ #-- test
+@@ -292,13 +300,14 @@
+
+ #-- check for errors
+ $errors = array(
+- "invalid object created" => !$this->is_valid(),
+- "captcha_id storage could not be saved" => !$this->saved,
+- "no ->id present" => empty($this->id),
+- "no ->created timestamp" => empty($this->created),
++ CAPTCHA_ERROBJ_TEXT => !$this->is_valid(),
++ CAPTCHA_ERRSAVE_TEXT => !$this->saved,
++ CAPTCHA_ERRID_TEXT => empty($this->id),
++ CAPTCHA_ERRCREA_TEXT => empty($this->created),
++ CAPTCHA_NOGD_TEXT => !function_exists('imagecreatetruecolor'),
+ );
+ if (array_sum($errors)) {
+- return '<div id="captcha" class="error">*' . implode("<br>*", array_keys(array_filter($errors))) . '</div>';
++ return '<div id="captcha" class="error">*' . implode("<br>*", array_filter(array_keys(array_filter($errors)), 'htmlentities')) . '</div>';
+ }
+
+ #-- prepare output vars
+@@ -310,20 +319,18 @@
+ $alt_text = htmlentities($this->text->question);
+ $new_urls = CAPTCHA_NEW_URLS ? 0 : 1;
+ $onClick = CAPTCHA_ONCLICK_HIRES ? 'onClick="this.src += this.src.match(/hires/) ? \'.\' : \'hires=1&\';"' : 'onClick="this.src += \'.\';"';
+- $onKeyDown = CAPTCHA_AJAX ? 'onKeyUp="captcha_check_solution()"' : '';
++ $onKeyUp = CAPTCHA_AJAX ? 'onKeyUp="captcha_check_solution()"' : '';
+ $javascript = CAPTCHA_AJAX ? '<script src="'.$base_url.'base.js&captcha_new_urls='.$new_urls.'" type="text/javascript" language="JavaScript" id="captcha_ajax_1"></script>' : '';
+- $error = function_exists('imagecreatetruecolor') ? '' : '<div class="error">PHP setup lacks GD. No image drawing possible</div>';
+
+ #-- assemble
+ $HTML =
+ //'<script type="text/javascript" language="JavaScript">if (document.getElementById("captcha")) { document.getElementById("captcha").parentNode.removeChild(document.getElementById("captcha")); }</script>' . // workaround for double instantiations
+ '<div id="captcha" class="captcha">' .
+- $error .
+ '<input type="hidden" id="'.$p_id.'" name="'.$p_id.'" value="'.$id.'" />' .
+- '<img src="'.$img_url .'&" width="'.$this->image->width.'" height="'.$this->image->height.'" alt="'.$alt_text.'" align="middle" '.$onClick.' title="' . CAPTCHA_REDRAW_TEXT . '" />' .
++ '<img src="'.$img_url .'&" width="'.$this->image->width.'" height="'.$this->image->height.'" alt="'.$alt_text.'" align="middle" '.$onClick.' title="' . htmlentities(CAPTCHA_REDRAW_TEXT) . '" />' .
+ '&nbsp;' .
+ $add_text .
+- '<input title="' . CAPTCHA_PROMPT_TEXT . '" type="text" '.$onKeyDown.' id="'.$p_input.'" name="'.$p_input.'" value="'.(isset($_REQUEST[$p_input])?htmlentities($_REQUEST[$p_input]):"") .
++ '<input title="' . htmlentities(CAPTCHA_PROMPT_TEXT) . '" type="text" '.$onKeyUp.' id="'.$p_input.'" name="'.$p_input.'" value="'.(isset($_REQUEST[$p_input])?htmlentities($_REQUEST[$p_input]):"") .
+ '" size="8" style="'.CAPTCHA_INPUT_STYLE.'" />' .
+ $javascript .
+ '</div>';
+@@ -337,9 +344,9 @@
+ function log($error, $category, $message) {
+ // append to text file
+ if (CAPTCHA_LOG) {
+- file_put_contents(
++ @file_put_contents(
+ CAPTCHA_TEMP_DIR . "/captcha.log",
+- "[$error] -$category- \"$message\" $_SERVER[REMOTE_ADDR] id={$this->id} tries={$this->tries} failures={$this->failures} created/time/expires=$this->created/".time()."/$this->expires \n",
++ "[$error] -$category- \"$message\" $_SERVER[REMOTE_ADDR] id={$this->id} tries={$this->tries} failures={$this->failures} created/time/expires={$this->created}/".time()."/{$this->expires} \n",
+ FILE_APPEND|LOCK_EX
+ );
+ }
+@@ -357,7 +364,7 @@
+ }
+ }
+ else {
+- $this->log("captcha file does not exist $fn");
++ $this->log("load", "INVALID", "captcha file does not exist $fn");
+ }
+ }
+
+@@ -365,34 +372,36 @@
+ function save() {
+ $this->straighten_temp_dir();
+ if ($fn = $this->data_file()) {
+- $this->saved = file_put_contents($fn, serialize($this), LOCK_EX);
++ $this->saved = @file_put_contents($fn, serialize($this), LOCK_EX);
+ }
+ }
+
+ #-- remove $this data file
+ function delete() {
+ // delete current and all previous data files
+- $this->prev[] = $this->id;
++ if (!empty($this->id)) {
++ $this->prev[] = $this->id;
++ }
+ if (isset($this->prev)) {
+- foreach ($this->prev as $id) {
++ foreach ((array)$this->prev as $id) {
+ @unlink($this->data_file($id));
+ }
+ }
+ // clean object
+ foreach ((array)$this as $name=>$val) {
+- unset($this->{$name});
++ $this->{$name} = false;
+ }
+- return(FALSE); // far if-chaining in ->is_valid()
++ return(FALSE); // for if-chaining in ->is_valid()
+ }
+
+ #-- clean-up or init temporary directory
+ function straighten_temp_dir() {
+ // create dir
+ if (!file_exists($dir=CAPTCHA_TEMP_DIR)) {
+- mkdir($dir);
++ @mkdir($dir);
+ }
+ // clean up old files
+- if ((rand(0,100) <= 5) && ($dh = opendir($dir))) {
++ if ((rand(0,100) <= 5) && ($dh = @opendir($dir))) {
+ $t_kill = time() - CAPTCHA_TIMEOUT * 1.2;
+ while($fn = readdir($dh)) if ($fn[0] != ".") {
+ if (filemtime("$dir/$fn") < $t_kill) {
+@@ -1013,10 +1022,11 @@
+
+ #-- determine usable temp directory
+ function tmp() {
++ $DIR = dirname(__FILE__);
+ return current(
+- array_filter( // filter by writability
++ @array_filter( // filter by writability
+ array_filter( // filter empty entries
+- @array(
++ array(
+ $_SERVER['TMPDIR'],
+ $_SERVER['REDIRECT_TMPDIR'],
+ $_SERVER['TEMP'],
+@@ -1024,7 +1034,8 @@
+ $_SERVER['TMP'],
+ $_SERVER['TEMPDIR'],
+ function_exists("sys_get_temp_dir") ? sys_get_temp_dir() : "",
+- '/tmp'
++ '/tmp', '/temp',
++ "$DIR/tmp", "$DIR/../tmp", "$DIR/../../tmp",
+ )
+ ),
+ "is_writable"
+@@ -1053,7 +1064,7 @@
+
+ #-- check
+ if ($expired || empty($c->image)) {
+- die(easy_captcha_utility::js_header('alert("captcha error: request invalid (wrong storage id) / or expired");'));
++ die(easy_captcha_utility::js_header('alert("' . addslashes(CAPTCHA_ERRINVREQ_TEXT) . '");'));
+ }
+ if (0 >= $c->ajax_tries--) {
+ $c->log("::API", "JS-RPC", "ajax_tries exhausted ($c->ajax_tries)");
+@@ -1258,4 +1269,4 @@
+
+
+
+-?>
+\ No newline at end of file
++?>
+diff -Naur captcha-2.3.orig/index.php captcha-2.3.new/index.php
+--- captcha-2.3.orig/index.php 2010-05-20 20:18:31.000000000 +0200
++++ captcha-2.3.new/index.php 2011-04-13 14:54:13.000000000 +0200
+@@ -3,7 +3,7 @@
+ // load library and preset a few options
+ define("CAPTCHA_INVERSE", 1); // black background
+ define("CAPTCHA_NEW_URLS", 0); // no auto-disabling/hiding for the demo
+- include("captcha.php");
++ include("captchaphp/captcha.php");
+
+ ?>
+ <html>
+@@ -109,7 +109,7 @@
+
+
+
+-<form action="index.php" method="GET" x-enctype="multipart/form-data" accept-encoding="UTF-8">
++<form action="<?php echo htmlspecialchars(basename($_SERVER['SCRIPT_NAME'])); ?>" method="GET" x-enctype="multipart/form-data" accept-encoding="UTF-8">
+ <textarea name="texta1" cols="40" rows="5">...</textarea>
+ <?php
+ // output CAPTCHA img + input box
+@@ -126,7 +126,7 @@
+
+
+ <div>
+- <a href="http://www.freshmeat.net/p/captchaphp">get updates (freshmeat.net)</a>
++ <a href="http://www.freshmeat.net/projects/captchaphp">get updates (freshmeat.net)</a>
+ |
+ <a href="captcha.tgz">download</a>
+ |
+diff -Naur captcha-2.3.orig/README captcha-2.3.new/README
+--- captcha-2.3.orig/README 2011-04-12 04:46:29.000000000 +0200
++++ captcha-2.3.new/README 2011-04-13 16:33:41.000000000 +0200
+@@ -399,7 +399,7 @@
+ - alternatives for finding temporary directory from env / php.ini
+
+ 2.2
+- - Many many many patches from Patrick Monerat, downstream Fedora
++ - Many many many patches from Patrick Monnerat, downstream Fedora
+ - different font distributed alongside
+
+ 2.1 (unreleased)
diff --git a/captcha-2.3.nofont.tar.gz b/captcha-2.3.nofont.tar.gz
new file mode 100644
index 0000000..21ce275
--- /dev/null
+++ b/captcha-2.3.nofont.tar.gz
Binary files differ
diff --git a/php-captchaphp.spec b/php-captchaphp.spec
new file mode 100644
index 0000000..2133c5c
--- /dev/null
+++ b/php-captchaphp.spec
@@ -0,0 +1,144 @@
+# The original source of this package contains a font with a forbidden
+# license.
+# The attached source tarball does not contain this font and has been
+# produced from the original by executing the following commands:
+#
+# wget http://web135.srv3.sysproserver.de/milki.erphesfurt.de./captcha/captcha-%{version}.tgz
+# tar xzf captcha-%{version}.tgz
+# rm -f captcha-%{version}/MyUnderwood.*
+# tar czf captcha-%{version}.nofont.tar.gz captcha-%{version}
+#
+# SHA1 sums:
+# facfe0f57adddd4e278852abd5499177f03a0c1f captcha-2.3.tgz
+# 5387d2972766d5109cb4ae8572350a2229a89705 captcha-2.3.nofont.tar.gz
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+%global fontdir %{_datadir}/fonts/dejavu
+%else
+%global fontdir %{_datadir}/fonts/freefont
+%endif
+
+Name: php-captchaphp
+Summary: PHP very user-friendly CAPTCHA solution
+Version: 2.3
+Release: 1%{?dist}
+
+# Public Domain or any FOSS License, see README
+# We're choosing MIT because it is universally compatible with other FOSS
+# licenses.
+License: Public Domain or MIT
+
+Group: System Environment/Libraries
+URL: http://freshmeat.net/projects/captchaphp/
+Source0: captcha-%{version}.nofont.tar.gz
+Patch1: captcha-2.3-24pre.patch
+Requires: php-gd >= 4.3.2
+Requires: %{fontdir}
+Buildarch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+ This PHP script provides a very user-friendly CAPTCHA solution.
+You can easily embed it into your <form> generation scripts to
+prevent spam-bot access.
+
+It strives to be accessible and implements an arithmetic riddle
+as alternative for visually impaired users. It does not require
+cookies, but makes use of "AJAX" to give users visual feedback
+for solving the CAPTCHA. It grants access fuzzily (when single
+letters were outguessed) instead of frustrating people. And it
+can be customized rather easily.
+
+
+#-------------------------------------------------------------------------------
+%prep
+#-------------------------------------------------------------------------------
+
+%setup -q -n captcha-%{version}
+%patch1 -p 1
+
+
+#-------------------------------------------------------------------------------
+%build
+#-------------------------------------------------------------------------------
+
+# Replace the font path by our (arbitrary) default font directory.
+
+sed -i -e "/CAPTCHA_FONT_DIR/s#,.*#, '%{fontdir}/');#" captcha.php
+
+
+#-------------------------------------------------------------------------------
+%install
+#-------------------------------------------------------------------------------
+
+rm -rf "${RPM_BUILD_ROOT}"
+
+# Install directory.
+
+install -p -d -m 755 "${RPM_BUILD_ROOT}/%{_datadir}/php/captchaphp/"
+
+
+# Install file.
+
+install -p -m 644 captcha.php "${RPM_BUILD_ROOT}/%{_datadir}/php/captchaphp/"
+
+
+#-------------------------------------------------------------------------------
+%clean
+#-------------------------------------------------------------------------------
+
+rm -rf "${RPM_BUILD_ROOT}"
+
+
+#-------------------------------------------------------------------------------
+%files
+#-------------------------------------------------------------------------------
+
+%defattr(-, root, root, -)
+%doc README index.php
+%{_datadir}/php/captchaphp
+
+
+#-------------------------------------------------------------------------------
+%changelog
+#-------------------------------------------------------------------------------
+
+* Sat Jul 17 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.3-1
+- rebuild for remi repository
+
+* Tue May 3 2011 Patrick Monnerat <pm@datasphere.ch> 2.3-1
+- New upstream release.
+- Patch "24pre" to apply pre 2.4 updates.
+
+* Wed Mar 9 2011 Remi Collet <RPMS@FamilleCollet.com> - 2.2-2.1
+- switch to freefont for EPEL <= 5
+
+* Mon Jul 5 2010 Remi Collet <RPMS@FamilleCollet.com> - 2.2-2
+- rebuild for remi repository
+
+* Mon Jun 14 2010 Patrick Monnerat <pm@datasphere.ch> 2.2-2
+- Using MIT license.
+
+* Tue May 25 2010 Patrick Monnerat <pm@datasphere.ch> 2.2-1
+- New upstream release.
+
+* Mon Jul 13 2009 Patrick Monnerat <pm@datasphere.ch> 2.0-3
+- Depends on font directory rather than font package: this circumvents the
+ font package name change done between F10 and F11.
+
+* Tue Jun 23 2009 Patrick Monnerat <pm@datasphere.ch> 2.0-2
+- Move class files to a package-specific sub-directory.
+- Get rid of build dependence on "ed".
+
+* Mon Jun 8 2009 Patrick Monnerat <pm@datasphere.ch> 2.0-1
+- Initial RPM spec file.
+- Patch "nodeferror" to allow predefining CAPTCHA_* constants without
+ issuing an error at include time.
+- Patch "https" to detect SSL use automatically.
+- Patch "undef" to fix an undefined index error.
+- Patch "directcall" to improve direct call detection.
+- Patch "translatable" to make module translatable through the use of
+ additional CAPTCHA_* defines for texts.
+- Font included in original package has an incompatible license: thus it
+ is not packaged. Instead, we use a reasonable default ttf font package and
+ directory.
generated by cgit (git 2.34.1) at 2024-04-20 05:36:23 +0000