| /tags/7.8.316-dfsg-1/debian/rules |
|---|
| File deleted |
|---|
|
|
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-mysql.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-mysql.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-mysql.install (nonexistent) |
|---|
| @@ -1,5 +0,0 @@ |
|---|
| -usr/lib/pike/*/7.4/include/mysql.h |
|---|
| -usr/lib/pike/*/modules/*Mysql.* |
|---|
| -#usr/share/pike/*/modules/*Mysql.* |
|---|
| -usr/lib/pike/*/modules/Sql.pmod/mysql* |
|---|
| -#usr/share/pike/*/modules/Sql.pmod/mysql* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-reference.doc-base |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-reference.doc-base (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-reference.doc-base (nonexistent) |
|---|
| @@ -1,10 +0,0 @@ |
|---|
| -Document: pike7.8-refdoc |
|---|
| -Title: Pike 7.8 Reference |
|---|
| -Author: The Pike Authors |
|---|
| -Abstract: This document contains the full reference of all |
|---|
| - the Pike modules and functions. |
|---|
| -Section: Programming |
|---|
| - |
|---|
| -Format: HTML |
|---|
| -Index: /usr/share/doc/pike7.8-doc/html/reference/index.html |
|---|
| -Files: /usr/share/doc/pike7.8-doc/html/reference/*.html |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-core.postrm |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-core.postrm (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-core.postrm (nonexistent) |
|---|
| @@ -1,43 +0,0 @@ |
|---|
| -#! /bin/sh |
|---|
| -# postrm script for #PACKAGE# |
|---|
| -# |
|---|
| -# see: dh_installdeb(1) |
|---|
| - |
|---|
| -set -e |
|---|
| - |
|---|
| -# summary of how this script can be called: |
|---|
| -# * <postrm> `remove' |
|---|
| -# * <postrm> `purge' |
|---|
| -# * <old-postrm> `upgrade' <new-version> |
|---|
| -# * <new-postrm> `failed-upgrade' <old-version> |
|---|
| -# * <new-postrm> `abort-install' |
|---|
| -# * <new-postrm> `abort-install' <old-version> |
|---|
| -# * <new-postrm> `abort-upgrade' <old-version> |
|---|
| -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> |
|---|
| -# for details, see http://www.debian.org/doc/debian-policy/ or |
|---|
| -# the debian-policy package |
|---|
| - |
|---|
| - |
|---|
| -case "$1" in |
|---|
| - purge) |
|---|
| - for d in include/pike include/pike7.8 lib/pike/site_pike lib/pike lib/pike7.8/site_pike lib/pike7.8 share/pike/site_pike \ |
|---|
| - share/pike share/pike7.8/site_pike share/pike7.8; do |
|---|
| - rmdir /usr/local/$d || true |
|---|
| - done |
|---|
| - ;; |
|---|
| - |
|---|
| - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
|---|
| - ;; |
|---|
| - |
|---|
| - *) |
|---|
| - echo "postrm called with unknown argument \`$1'" >&2 |
|---|
| - exit 1 |
|---|
| - |
|---|
| -esac |
|---|
| - |
|---|
| -# dh_installdeb will replace this with shell code automatically |
|---|
| -# generated by other debhelper scripts. |
|---|
| - |
|---|
| -#DEBHELPER# |
|---|
| - |
|---|
| -exit 0 |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-pg.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-pg.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-pg.install (nonexistent) |
|---|
| @@ -1,5 +0,0 @@ |
|---|
| -usr/lib/pike/*/7.4/include/postgres.h |
|---|
| -usr/lib/pike/*/modules/*Postgres.* |
|---|
| -#usr/share/pike/*/modules/*Postgres.* |
|---|
| -usr/lib/pike/*/modules/Sql.pmod/postgres* |
|---|
| -#usr/share/pike/*/modules/Sql.pmod/postgres* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike-config.in |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike-config.in (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike-config.in (nonexistent) |
|---|
| @@ -1,36 +0,0 @@ |
|---|
| -#!/bin/sh |
|---|
| -# |
|---|
| -# $Id: pike-config.in,v 1.1 2002/08/12 01:02:31 grendel Exp $ |
|---|
| -# |
|---|
| - |
|---|
| -MY_CFLAGS="@CFLAGS@" |
|---|
| -MY_LDFLAGS="@LDFLAGS@" |
|---|
| -MY_VERSION="@MAJOR@.@MINOR@.@BUILD@" |
|---|
| - |
|---|
| -if test -z "$1"; then |
|---|
| - cat <<EOF |
|---|
| -Usage: pike-config [--cflags] [--ldflags] [--version] |
|---|
| - |
|---|
| - --cflags Print the compiler flags required to compile a module |
|---|
| - --ldflags Print the linker flags required to link a module |
|---|
| - --version Print the pike version for which the compilation is taking |
|---|
| - place |
|---|
| - |
|---|
| -EOF |
|---|
| - exit 1 |
|---|
| -fi |
|---|
| - |
|---|
| -while true; do |
|---|
| - if test -z "$1"; then |
|---|
| - break |
|---|
| - fi |
|---|
| - |
|---|
| - case $1 in |
|---|
| - --cflags) echo -n "${MY_CFLAGS} " ;; |
|---|
| - --ldflags) echo -n "${MY_LDFLAGS} " ;; |
|---|
| - --version) echo -n "${MY_VERSION} " ;; |
|---|
| - esac |
|---|
| - shift |
|---|
| -done |
|---|
| - |
|---|
| -echo |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-dnssd.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-dnssd.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-dnssd.install (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*DNS_SD.* |
|---|
| -#usr/share/pike/*/modules/*DNS_SD.* |
|---|
| Index: 7.8.316-dfsg-1/debian/copyright |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/copyright (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/copyright (nonexistent) |
|---|
| @@ -1,535 +0,0 @@ |
|---|
| -This package was debianized by Marek Habersack <grendel@debian.org> on |
|---|
| -Sun, 5 May 2002 01:34:05 +0200. |
|---|
| - |
|---|
| -The current maintainer is Magnus Holmgren <holmgren@debian.org> with |
|---|
| -some help from Henrik Andreasson <pike@han.pp.se>. |
|---|
| - |
|---|
| -It was downloaded from http://pike.ida.liu.se/download/pub/pike/ |
|---|
| - |
|---|
| -The upstream tarball has been repacked without the 'bundles' |
|---|
| -subdirectory, which contains redundant copies of some libraries, to |
|---|
| -avoid shipping some non-DFSG-compliant bits (see the gmp package) and |
|---|
| -having to include the copyright information and licenses of those |
|---|
| -libraries. |
|---|
| - |
|---|
| -Copyright © 1994-1996 Fredrik Hübinette |
|---|
| -Copyright © 1996-1997 Informationsvävarna AB |
|---|
| -Copyright © 1997-2000 Idonex AB |
|---|
| -Copyright © 2000-2002 Roxen Internet Software AB |
|---|
| -Copyright © 2002-2008 Department of Computer and Information Science, |
|---|
| - Linköping University |
|---|
| - |
|---|
| -Pike refers to the source code, and any executables |
|---|
| -created from the same source code. Parts of other |
|---|
| -copyrighted works are included in Pike, in accordance |
|---|
| -with their respective conditions for distribution. |
|---|
| - |
|---|
| -Doug Lea's Malloc |
|---|
| -Copyright © 1987-2005 Doug Lea |
|---|
| - |
|---|
| -Emacs font lock definitions |
|---|
| -Copyright © 2002 Martin Stjernholm |
|---|
| - |
|---|
| -IDEA encryption and decryption code |
|---|
| -Copyright © Xuejia Lai |
|---|
| - |
|---|
| -JPEG transform code |
|---|
| -Copyright © 1991-1998, Thomas G. Lane, Independent JPEG Group |
|---|
| - |
|---|
| -MD5 password hash code |
|---|
| -Copyright © Poul-Henning Kamp |
|---|
| - |
|---|
| -Regular expression matching code |
|---|
| -Copyright © 1986 by University of Toronto. |
|---|
| - |
|---|
| -TrueVision Targa code |
|---|
| -Copyright © 1997 Raphael FRANCOIS and Gordon Matzigkeit |
|---|
| - |
|---|
| -Unicode Character Database |
|---|
| -Copyright © 1991-2005 Unicode, Inc. |
|---|
| - |
|---|
| -Zlib detection and verification code |
|---|
| -Copyright © 1995-1998 Jean-loup Gailly and Mark Adler |
|---|
| - |
|---|
| -License: |
|---|
| - |
|---|
| -The Pike source is distributed under GPL (GNU General Public License 2), LGPL |
|---|
| -(GNU Lesser General Public License 2.1) and MPL (Mozilla Public License 1.1). |
|---|
| - |
|---|
| -On Debian GNU/Linux systems, the complete text of the GNU General |
|---|
| -Public License can be found in `/usr/share/common-licenses/GPL-2'. |
|---|
| - |
|---|
| -On Debian GNU/Linux systems, the complete text of the GNU Lesser General |
|---|
| -Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. |
|---|
| - |
|---|
| -The full text of the Mozilla Public License 1.1 follows. |
|---|
| - |
|---|
| - MOZILLA PUBLIC LICENSE |
|---|
| - Version 1.1 |
|---|
| - |
|---|
| - --------------- |
|---|
| - |
|---|
| -1. Definitions. |
|---|
| - |
|---|
| - 1.0.1. "Commercial Use" means distribution or otherwise making the |
|---|
| - Covered Code available to a third party. |
|---|
| - |
|---|
| - 1.1. "Contributor" means each entity that creates or contributes to |
|---|
| - the creation of Modifications. |
|---|
| - |
|---|
| - 1.2. "Contributor Version" means the combination of the Original |
|---|
| - Code, prior Modifications used by a Contributor, and the Modifications |
|---|
| - made by that particular Contributor. |
|---|
| - |
|---|
| - 1.3. "Covered Code" means the Original Code or Modifications or the |
|---|
| - combination of the Original Code and Modifications, in each case |
|---|
| - including portions thereof. |
|---|
| - |
|---|
| - 1.4. "Electronic Distribution Mechanism" means a mechanism generally |
|---|
| - accepted in the software development community for the electronic |
|---|
| - transfer of data. |
|---|
| - |
|---|
| - 1.5. "Executable" means Covered Code in any form other than Source |
|---|
| - Code. |
|---|
| - |
|---|
| - 1.6. "Initial Developer" means the individual or entity identified |
|---|
| - as the Initial Developer in the Source Code notice required by Exhibit |
|---|
| - A. |
|---|
| - |
|---|
| - 1.7. "Larger Work" means a work which combines Covered Code or |
|---|
| - portions thereof with code not governed by the terms of this License. |
|---|
| - |
|---|
| - 1.8. "License" means this document. |
|---|
| - |
|---|
| - 1.8.1. "Licensable" means having the right to grant, to the maximum |
|---|
| - extent possible, whether at the time of the initial grant or |
|---|
| - subsequently acquired, any and all of the rights conveyed herein. |
|---|
| - |
|---|
| - 1.9. "Modifications" means any addition to or deletion from the |
|---|
| - substance or structure of either the Original Code or any previous |
|---|
| - Modifications. When Covered Code is released as a series of files, a |
|---|
| - Modification is: |
|---|
| - A. Any addition to or deletion from the contents of a file |
|---|
| - containing Original Code or previous Modifications. |
|---|
| - |
|---|
| - B. Any new file that contains any part of the Original Code or |
|---|
| - previous Modifications. |
|---|
| - |
|---|
| - 1.10. "Original Code" means Source Code of computer software code |
|---|
| - which is described in the Source Code notice required by Exhibit A as |
|---|
| - Original Code, and which, at the time of its release under this |
|---|
| - License is not already Covered Code governed by this License. |
|---|
| - |
|---|
| - 1.10.1. "Patent Claims" means any patent claim(s), now owned or |
|---|
| - hereafter acquired, including without limitation, method, process, |
|---|
| - and apparatus claims, in any patent Licensable by grantor. |
|---|
| - |
|---|
| - 1.11. "Source Code" means the preferred form of the Covered Code for |
|---|
| - making modifications to it, including all modules it contains, plus |
|---|
| - any associated interface definition files, scripts used to control |
|---|
| - compilation and installation of an Executable, or source code |
|---|
| - differential comparisons against either the Original Code or another |
|---|
| - well known, available Covered Code of the Contributor's choice. The |
|---|
| - Source Code can be in a compressed or archival form, provided the |
|---|
| - appropriate decompression or de-archiving software is widely available |
|---|
| - for no charge. |
|---|
| - |
|---|
| - 1.12. "You" (or "Your") means an individual or a legal entity |
|---|
| - exercising rights under, and complying with all of the terms of, this |
|---|
| - License or a future version of this License issued under Section 6.1. |
|---|
| - For legal entities, "You" includes any entity which controls, is |
|---|
| - controlled by, or is under common control with You. For purposes of |
|---|
| - this definition, "control" means (a) the power, direct or indirect, |
|---|
| - to cause the direction or management of such entity, whether by |
|---|
| - contract or otherwise, or (b) ownership of more than fifty percent |
|---|
| - (50%) of the outstanding shares or beneficial ownership of such |
|---|
| - entity. |
|---|
| - |
|---|
| -2. Source Code License. |
|---|
| - |
|---|
| - 2.1. The Initial Developer Grant. |
|---|
| - The Initial Developer hereby grants You a world-wide, royalty-free, |
|---|
| - non-exclusive license, subject to third party intellectual property |
|---|
| - claims: |
|---|
| - (a) under intellectual property rights (other than patent or |
|---|
| - trademark) Licensable by Initial Developer to use, reproduce, |
|---|
| - modify, display, perform, sublicense and distribute the Original |
|---|
| - Code (or portions thereof) with or without Modifications, and/or |
|---|
| - as part of a Larger Work; and |
|---|
| - |
|---|
| - (b) under Patents Claims infringed by the making, using or |
|---|
| - selling of Original Code, to make, have made, use, practice, |
|---|
| - sell, and offer for sale, and/or otherwise dispose of the |
|---|
| - Original Code (or portions thereof). |
|---|
| - |
|---|
| - (c) the licenses granted in this Section 2.1(a) and (b) are |
|---|
| - effective on the date Initial Developer first distributes |
|---|
| - Original Code under the terms of this License. |
|---|
| - |
|---|
| - (d) Notwithstanding Section 2.1(b) above, no patent license is |
|---|
| - granted: 1) for code that You delete from the Original Code; 2) |
|---|
| - separate from the Original Code; or 3) for infringements caused |
|---|
| - by: i) the modification of the Original Code or ii) the |
|---|
| - combination of the Original Code with other software or devices. |
|---|
| - |
|---|
| - 2.2. Contributor Grant. |
|---|
| - Subject to third party intellectual property claims, each Contributor |
|---|
| - hereby grants You a world-wide, royalty-free, non-exclusive license |
|---|
| - |
|---|
| - (a) under intellectual property rights (other than patent or |
|---|
| - trademark) Licensable by Contributor, to use, reproduce, modify, |
|---|
| - display, perform, sublicense and distribute the Modifications |
|---|
| - created by such Contributor (or portions thereof) either on an |
|---|
| - unmodified basis, with other Modifications, as Covered Code |
|---|
| - and/or as part of a Larger Work; and |
|---|
| - |
|---|
| - (b) under Patent Claims infringed by the making, using, or |
|---|
| - selling of Modifications made by that Contributor either alone |
|---|
| - and/or in combination with its Contributor Version (or portions |
|---|
| - of such combination), to make, use, sell, offer for sale, have |
|---|
| - made, and/or otherwise dispose of: 1) Modifications made by that |
|---|
| - Contributor (or portions thereof); and 2) the combination of |
|---|
| - Modifications made by that Contributor with its Contributor |
|---|
| - Version (or portions of such combination). |
|---|
| - |
|---|
| - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are |
|---|
| - effective on the date Contributor first makes Commercial Use of |
|---|
| - the Covered Code. |
|---|
| - |
|---|
| - (d) Notwithstanding Section 2.2(b) above, no patent license is |
|---|
| - granted: 1) for any code that Contributor has deleted from the |
|---|
| - Contributor Version; 2) separate from the Contributor Version; |
|---|
| - 3) for infringements caused by: i) third party modifications of |
|---|
| - Contributor Version or ii) the combination of Modifications made |
|---|
| - by that Contributor with other software (except as part of the |
|---|
| - Contributor Version) or other devices; or 4) under Patent Claims |
|---|
| - infringed by Covered Code in the absence of Modifications made by |
|---|
| - that Contributor. |
|---|
| - |
|---|
| -3. Distribution Obligations. |
|---|
| - |
|---|
| - 3.1. Application of License. |
|---|
| - The Modifications which You create or to which You contribute are |
|---|
| - governed by the terms of this License, including without limitation |
|---|
| - Section 2.2. The Source Code version of Covered Code may be |
|---|
| - distributed only under the terms of this License or a future version |
|---|
| - of this License released under Section 6.1, and You must include a |
|---|
| - copy of this License with every copy of the Source Code You |
|---|
| - distribute. You may not offer or impose any terms on any Source Code |
|---|
| - version that alters or restricts the applicable version of this |
|---|
| - License or the recipients' rights hereunder. However, You may include |
|---|
| - an additional document offering the additional rights described in |
|---|
| - Section 3.5. |
|---|
| - |
|---|
| - 3.2. Availability of Source Code. |
|---|
| - Any Modification which You create or to which You contribute must be |
|---|
| - made available in Source Code form under the terms of this License |
|---|
| - either on the same media as an Executable version or via an accepted |
|---|
| - Electronic Distribution Mechanism to anyone to whom you made an |
|---|
| - Executable version available; and if made available via Electronic |
|---|
| - Distribution Mechanism, must remain available for at least twelve (12) |
|---|
| - months after the date it initially became available, or at least six |
|---|
| - (6) months after a subsequent version of that particular Modification |
|---|
| - has been made available to such recipients. You are responsible for |
|---|
| - ensuring that the Source Code version remains available even if the |
|---|
| - Electronic Distribution Mechanism is maintained by a third party. |
|---|
| - |
|---|
| - 3.3. Description of Modifications. |
|---|
| - You must cause all Covered Code to which You contribute to contain a |
|---|
| - file documenting the changes You made to create that Covered Code and |
|---|
| - the date of any change. You must include a prominent statement that |
|---|
| - the Modification is derived, directly or indirectly, from Original |
|---|
| - Code provided by the Initial Developer and including the name of the |
|---|
| - Initial Developer in (a) the Source Code, and (b) in any notice in an |
|---|
| - Executable version or related documentation in which You describe the |
|---|
| - origin or ownership of the Covered Code. |
|---|
| - |
|---|
| - 3.4. Intellectual Property Matters |
|---|
| - (a) Third Party Claims. |
|---|
| - If Contributor has knowledge that a license under a third party's |
|---|
| - intellectual property rights is required to exercise the rights |
|---|
| - granted by such Contributor under Sections 2.1 or 2.2, |
|---|
| - Contributor must include a text file with the Source Code |
|---|
| - distribution titled "LEGAL" which describes the claim and the |
|---|
| - party making the claim in sufficient detail that a recipient will |
|---|
| - know whom to contact. If Contributor obtains such knowledge after |
|---|
| - the Modification is made available as described in Section 3.2, |
|---|
| - Contributor shall promptly modify the LEGAL file in all copies |
|---|
| - Contributor makes available thereafter and shall take other steps |
|---|
| - (such as notifying appropriate mailing lists or newsgroups) |
|---|
| - reasonably calculated to inform those who received the Covered |
|---|
| - Code that new knowledge has been obtained. |
|---|
| - |
|---|
| - (b) Contributor APIs. |
|---|
| - If Contributor's Modifications include an application programming |
|---|
| - interface and Contributor has knowledge of patent licenses which |
|---|
| - are reasonably necessary to implement that API, Contributor must |
|---|
| - also include this information in the LEGAL file. |
|---|
| - |
|---|
| - (c) Representations. |
|---|
| - Contributor represents that, except as disclosed pursuant to |
|---|
| - Section 3.4(a) above, Contributor believes that Contributor's |
|---|
| - Modifications are Contributor's original creation(s) and/or |
|---|
| - Contributor has sufficient rights to grant the rights conveyed by |
|---|
| - this License. |
|---|
| - |
|---|
| - 3.5. Required Notices. |
|---|
| - You must duplicate the notice in Exhibit A in each file of the Source |
|---|
| - Code. If it is not possible to put such notice in a particular Source |
|---|
| - Code file due to its structure, then You must include such notice in a |
|---|
| - location (such as a relevant directory) where a user would be likely |
|---|
| - to look for such a notice. If You created one or more Modification(s) |
|---|
| - You may add your name as a Contributor to the notice described in |
|---|
| - Exhibit A. You must also duplicate this License in any documentation |
|---|
| - for the Source Code where You describe recipients' rights or ownership |
|---|
| - rights relating to Covered Code. You may choose to offer, and to |
|---|
| - charge a fee for, warranty, support, indemnity or liability |
|---|
| - obligations to one or more recipients of Covered Code. However, You |
|---|
| - may do so only on Your own behalf, and not on behalf of the Initial |
|---|
| - Developer or any Contributor. You must make it absolutely clear than |
|---|
| - any such warranty, support, indemnity or liability obligation is |
|---|
| - offered by You alone, and You hereby agree to indemnify the Initial |
|---|
| - Developer and every Contributor for any liability incurred by the |
|---|
| - Initial Developer or such Contributor as a result of warranty, |
|---|
| - support, indemnity or liability terms You offer. |
|---|
| - |
|---|
| - 3.6. Distribution of Executable Versions. |
|---|
| - You may distribute Covered Code in Executable form only if the |
|---|
| - requirements of Section 3.1-3.5 have been met for that Covered Code, |
|---|
| - and if You include a notice stating that the Source Code version of |
|---|
| - the Covered Code is available under the terms of this License, |
|---|
| - including a description of how and where You have fulfilled the |
|---|
| - obligations of Section 3.2. The notice must be conspicuously included |
|---|
| - in any notice in an Executable version, related documentation or |
|---|
| - collateral in which You describe recipients' rights relating to the |
|---|
| - Covered Code. You may distribute the Executable version of Covered |
|---|
| - Code or ownership rights under a license of Your choice, which may |
|---|
| - contain terms different from this License, provided that You are in |
|---|
| - compliance with the terms of this License and that the license for the |
|---|
| - Executable version does not attempt to limit or alter the recipient's |
|---|
| - rights in the Source Code version from the rights set forth in this |
|---|
| - License. If You distribute the Executable version under a different |
|---|
| - license You must make it absolutely clear that any terms which differ |
|---|
| - from this License are offered by You alone, not by the Initial |
|---|
| - Developer or any Contributor. You hereby agree to indemnify the |
|---|
| - Initial Developer and every Contributor for any liability incurred by |
|---|
| - the Initial Developer or such Contributor as a result of any such |
|---|
| - terms You offer. |
|---|
| - |
|---|
| - 3.7. Larger Works. |
|---|
| - You may create a Larger Work by combining Covered Code with other code |
|---|
| - not governed by the terms of this License and distribute the Larger |
|---|
| - Work as a single product. In such a case, You must make sure the |
|---|
| - requirements of this License are fulfilled for the Covered Code. |
|---|
| - |
|---|
| -4. Inability to Comply Due to Statute or Regulation. |
|---|
| - |
|---|
| - If it is impossible for You to comply with any of the terms of this |
|---|
| - License with respect to some or all of the Covered Code due to |
|---|
| - statute, judicial order, or regulation then You must: (a) comply with |
|---|
| - the terms of this License to the maximum extent possible; and (b) |
|---|
| - describe the limitations and the code they affect. Such description |
|---|
| - must be included in the LEGAL file described in Section 3.4 and must |
|---|
| - be included with all distributions of the Source Code. Except to the |
|---|
| - extent prohibited by statute or regulation, such description must be |
|---|
| - sufficiently detailed for a recipient of ordinary skill to be able to |
|---|
| - understand it. |
|---|
| - |
|---|
| -5. Application of this License. |
|---|
| - |
|---|
| - This License applies to code to which the Initial Developer has |
|---|
| - attached the notice in Exhibit A and to related Covered Code. |
|---|
| - |
|---|
| -6. Versions of the License. |
|---|
| - |
|---|
| - 6.1. New Versions. |
|---|
| - Netscape Communications Corporation ("Netscape") may publish revised |
|---|
| - and/or new versions of the License from time to time. Each version |
|---|
| - will be given a distinguishing version number. |
|---|
| - |
|---|
| - 6.2. Effect of New Versions. |
|---|
| - Once Covered Code has been published under a particular version of the |
|---|
| - License, You may always continue to use it under the terms of that |
|---|
| - version. You may also choose to use such Covered Code under the terms |
|---|
| - of any subsequent version of the License published by Netscape. No one |
|---|
| - other than Netscape has the right to modify the terms applicable to |
|---|
| - Covered Code created under this License. |
|---|
| - |
|---|
| - 6.3. Derivative Works. |
|---|
| - If You create or use a modified version of this License (which you may |
|---|
| - only do in order to apply it to code which is not already Covered Code |
|---|
| - governed by this License), You must (a) rename Your license so that |
|---|
| - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", |
|---|
| - "MPL", "NPL" or any confusingly similar phrase do not appear in your |
|---|
| - license (except to note that your license differs from this License) |
|---|
| - and (b) otherwise make it clear that Your version of the license |
|---|
| - contains terms which differ from the Mozilla Public License and |
|---|
| - Netscape Public License. (Filling in the name of the Initial |
|---|
| - Developer, Original Code or Contributor in the notice described in |
|---|
| - Exhibit A shall not of themselves be deemed to be modifications of |
|---|
| - this License.) |
|---|
| - |
|---|
| -7. DISCLAIMER OF WARRANTY. |
|---|
| - |
|---|
| - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, |
|---|
| - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, |
|---|
| - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF |
|---|
| - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. |
|---|
| - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE |
|---|
| - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, |
|---|
| - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE |
|---|
| - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER |
|---|
| - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF |
|---|
| - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. |
|---|
| - |
|---|
| -8. TERMINATION. |
|---|
| - |
|---|
| - 8.1. This License and the rights granted hereunder will terminate |
|---|
| - automatically if You fail to comply with terms herein and fail to cure |
|---|
| - such breach within 30 days of becoming aware of the breach. All |
|---|
| - sublicenses to the Covered Code which are properly granted shall |
|---|
| - survive any termination of this License. Provisions which, by their |
|---|
| - nature, must remain in effect beyond the termination of this License |
|---|
| - shall survive. |
|---|
| - |
|---|
| - 8.2. If You initiate litigation by asserting a patent infringement |
|---|
| - claim (excluding declatory judgment actions) against Initial Developer |
|---|
| - or a Contributor (the Initial Developer or Contributor against whom |
|---|
| - You file such action is referred to as "Participant") alleging that: |
|---|
| - |
|---|
| - (a) such Participant's Contributor Version directly or indirectly |
|---|
| - infringes any patent, then any and all rights granted by such |
|---|
| - Participant to You under Sections 2.1 and/or 2.2 of this License |
|---|
| - shall, upon 60 days notice from Participant terminate prospectively, |
|---|
| - unless if within 60 days after receipt of notice You either: (i) |
|---|
| - agree in writing to pay Participant a mutually agreeable reasonable |
|---|
| - royalty for Your past and future use of Modifications made by such |
|---|
| - Participant, or (ii) withdraw Your litigation claim with respect to |
|---|
| - the Contributor Version against such Participant. If within 60 days |
|---|
| - of notice, a reasonable royalty and payment arrangement are not |
|---|
| - mutually agreed upon in writing by the parties or the litigation claim |
|---|
| - is not withdrawn, the rights granted by Participant to You under |
|---|
| - Sections 2.1 and/or 2.2 automatically terminate at the expiration of |
|---|
| - the 60 day notice period specified above. |
|---|
| - |
|---|
| - (b) any software, hardware, or device, other than such Participant's |
|---|
| - Contributor Version, directly or indirectly infringes any patent, then |
|---|
| - any rights granted to You by such Participant under Sections 2.1(b) |
|---|
| - and 2.2(b) are revoked effective as of the date You first made, used, |
|---|
| - sold, distributed, or had made, Modifications made by that |
|---|
| - Participant. |
|---|
| - |
|---|
| - 8.3. If You assert a patent infringement claim against Participant |
|---|
| - alleging that such Participant's Contributor Version directly or |
|---|
| - indirectly infringes any patent where such claim is resolved (such as |
|---|
| - by license or settlement) prior to the initiation of patent |
|---|
| - infringement litigation, then the reasonable value of the licenses |
|---|
| - granted by such Participant under Sections 2.1 or 2.2 shall be taken |
|---|
| - into account in determining the amount or value of any payment or |
|---|
| - license. |
|---|
| - |
|---|
| - 8.4. In the event of termination under Sections 8.1 or 8.2 above, |
|---|
| - all end user license agreements (excluding distributors and resellers) |
|---|
| - which have been validly granted by You or any distributor hereunder |
|---|
| - prior to termination shall survive termination. |
|---|
| - |
|---|
| -9. LIMITATION OF LIABILITY. |
|---|
| - |
|---|
| - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT |
|---|
| - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL |
|---|
| - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, |
|---|
| - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR |
|---|
| - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY |
|---|
| - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, |
|---|
| - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER |
|---|
| - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN |
|---|
| - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF |
|---|
| - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY |
|---|
| - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW |
|---|
| - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE |
|---|
| - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO |
|---|
| - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. |
|---|
| - |
|---|
| -10. U.S. GOVERNMENT END USERS. |
|---|
| - |
|---|
| - The Covered Code is a "commercial item," as that term is defined in |
|---|
| - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer |
|---|
| - software" and "commercial computer software documentation," as such |
|---|
| - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 |
|---|
| - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), |
|---|
| - all U.S. Government End Users acquire Covered Code with only those |
|---|
| - rights set forth herein. |
|---|
| - |
|---|
| -11. MISCELLANEOUS. |
|---|
| - |
|---|
| - This License represents the complete agreement concerning subject |
|---|
| - matter hereof. If any provision of this License is held to be |
|---|
| - unenforceable, such provision shall be reformed only to the extent |
|---|
| - necessary to make it enforceable. This License shall be governed by |
|---|
| - California law provisions (except to the extent applicable law, if |
|---|
| - any, provides otherwise), excluding its conflict-of-law provisions. |
|---|
| - With respect to disputes in which at least one party is a citizen of, |
|---|
| - or an entity chartered or registered to do business in the United |
|---|
| - States of America, any litigation relating to this License shall be |
|---|
| - subject to the jurisdiction of the Federal Courts of the Northern |
|---|
| - District of California, with venue lying in Santa Clara County, |
|---|
| - California, with the losing party responsible for costs, including |
|---|
| - without limitation, court costs and reasonable attorneys' fees and |
|---|
| - expenses. The application of the United Nations Convention on |
|---|
| - Contracts for the International Sale of Goods is expressly excluded. |
|---|
| - Any law or regulation which provides that the language of a contract |
|---|
| - shall be construed against the drafter shall not apply to this |
|---|
| - License. |
|---|
| - |
|---|
| -12. RESPONSIBILITY FOR CLAIMS. |
|---|
| - |
|---|
| - As between Initial Developer and the Contributors, each party is |
|---|
| - responsible for claims and damages arising, directly or indirectly, |
|---|
| - out of its utilization of rights under this License and You agree to |
|---|
| - work with Initial Developer and Contributors to distribute such |
|---|
| - responsibility on an equitable basis. Nothing herein is intended or |
|---|
| - shall be deemed to constitute any admission of liability. |
|---|
| - |
|---|
| -13. MULTIPLE-LICENSED CODE. |
|---|
| - |
|---|
| - Initial Developer may designate portions of the Covered Code as |
|---|
| - "Multiple-Licensed". "Multiple-Licensed" means that the Initial |
|---|
| - Developer permits you to utilize portions of the Covered Code under |
|---|
| - Your choice of the NPL or the alternative licenses, if any, specified |
|---|
| - by the Initial Developer in the file described in Exhibit A. |
|---|
| - |
|---|
| -EXHIBIT A -Mozilla Public License. |
|---|
| - |
|---|
| - ``The contents of this file are subject to the Mozilla Public License |
|---|
| - Version 1.1 (the "License"); you may not use this file except in |
|---|
| - compliance with the License. You may obtain a copy of the License at |
|---|
| - http://www.mozilla.org/MPL/ |
|---|
| - |
|---|
| - Software distributed under the License is distributed on an "AS IS" |
|---|
| - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the |
|---|
| - License for the specific language governing rights and limitations |
|---|
| - under the License. |
|---|
| - |
|---|
| - The Original Code is ______________________________________. |
|---|
| - |
|---|
| - The Initial Developer of the Original Code is ________________________. |
|---|
| - Portions created by ______________________ are Copyright (C) ______ |
|---|
| - _______________________. All Rights Reserved. |
|---|
| - |
|---|
| - Contributor(s): ______________________________________. |
|---|
| - |
|---|
| - Alternatively, the contents of this file may be used under the terms |
|---|
| - of the _____ license (the "[___] License"), in which case the |
|---|
| - provisions of [______] License are applicable instead of those |
|---|
| - above. If you wish to allow use of your version of this file only |
|---|
| - under the terms of the [____] License and not to allow others to use |
|---|
| - your version of this file under the MPL, indicate your decision by |
|---|
| - deleting the provisions above and replace them with the notice and |
|---|
| - other provisions required by the [___] License. If you do not delete |
|---|
| - the provisions above, a recipient may use your version of this file |
|---|
| - under either the MPL or the [___] License." |
|---|
| - |
|---|
| - [NOTE: The text of this Exhibit A may differ slightly from the text of |
|---|
| - the notices in the Source Code files of the Original Code. You should |
|---|
| - use the text of this Exhibit A rather than the text found in the |
|---|
| - Original Code Source Code for Your Modifications.] |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-java.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-java.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-java.install (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*Java.* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-image.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-image.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-image.install (nonexistent) |
|---|
| @@ -1,6 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/Image.so |
|---|
| -usr/lib/pike/*/modules/*Image_[!S]*.so |
|---|
| -usr/lib/pike/*/modules/*Image*.pmod |
|---|
| -#usr/share/pike/*/modules/*Image*.pmod* |
|---|
| -#usr/share/pike/*/modules/_Image.pmod |
|---|
| -usr/lib/pike/*/modules/_Image.pmod |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-sdl.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-sdl.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-sdl.install (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*SDL.* |
|---|
| -#usr/share/pike/*/modules/*SDL.* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-manual.doc-base |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-manual.doc-base (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-manual.doc-base (nonexistent) |
|---|
| @@ -1,10 +0,0 @@ |
|---|
| -Document: pike7.8-manual |
|---|
| -Title: Pike 7.8 Manual |
|---|
| -Author: The Pike Authors |
|---|
| -Abstract: This manual describes the Pike 7.8 language and contains |
|---|
| - a short tutorial on the language. |
|---|
| -Section: Programming |
|---|
| - |
|---|
| -Format: HTML |
|---|
| -Index: /usr/share/doc/pike7.8-doc/html/manual/index.html |
|---|
| -Files: /usr/share/doc/pike7.8-doc/html/manual/*.html |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-gtk.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-gtk.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-gtk.install (nonexistent) |
|---|
| @@ -1,8 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/GDK* |
|---|
| -usr/lib/pike/*/modules/Gnome* |
|---|
| -usr/lib/pike/*/modules/GTKSupport.pmod |
|---|
| -usr/lib/pike/*/modules/*GTK* |
|---|
| -#usr/share/pike/*/modules/GDK* |
|---|
| -#usr/share/pike/*/modules/Gnome* |
|---|
| -#usr/share/pike/*/modules/GTKSupport.pmod |
|---|
| -#usr/share/pike/*/modules/*GTK* |
|---|
| Index: 7.8.316-dfsg-1/debian/README.Debian |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/README.Debian (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/README.Debian (nonexistent) |
|---|
| @@ -1,61 +0,0 @@ |
|---|
| -Missing modules |
|---|
| ---------------- |
|---|
| - |
|---|
| -The following modules are not included in the Debian Pike packages for |
|---|
| -various reasons, even if they are included in the module reference |
|---|
| -(pike7.6-reference): |
|---|
| - |
|---|
| - - DVB: Doesn't work with Linux 2.6 (and certainly not with other OSes). |
|---|
| - - _Ffmpeg: formerly missing from Debian due to patent issues. Might be |
|---|
| - included in the next release. |
|---|
| - - Gnome, GTK, GDK: Uses obsolete GTK version (1.2). |
|---|
| - - Math.Transforms.FFT: Few use cases in Pike, pulls in unnecessary |
|---|
| - dependencies. |
|---|
| - - Mird: Old, unmaintained, largely unknown library. |
|---|
| - - Msql: Obsolete, proprietary DBM. |
|---|
| - - PDF: Uses unmaintained libraries unavailable in Debian. |
|---|
| - - Ssleay: Obsolete. |
|---|
| - - Oracle: Proprietary DBM (so far ...). |
|---|
| - - Java: Links with the JVM library in a non-policy compliant |
|---|
| - way. Work needed. |
|---|
| - - Image.TTF: Uses obsolete library (freetype1). |
|---|
| - |
|---|
| -Places to visit |
|---|
| ---------------- |
|---|
| - - http://pike.ida.liu.se/ - the main Pike site |
|---|
| - - http://community.roxen.com - community site for users of the |
|---|
| - Roxen webserver and the Pike bugs database, information etc. |
|---|
| - - http://caudium.net/ - website of the Caudium WebServer which is |
|---|
| - written in Pike |
|---|
| - - http://www.roxen.com/ - website of the Roxen IS, the company which |
|---|
| - for a long time developed and maintained Pike as well as the Roxen |
|---|
| - WebServer mentioned above. |
|---|
| - |
|---|
| -Notes for developers |
|---|
| --------------------- |
|---|
| - |
|---|
| -The postinst script created a few directories in /usr/local which you can |
|---|
| -use for your modules/include files. Once created by the postinst script |
|---|
| -they will never be touched by any pike package again. The directories |
|---|
| -are: |
|---|
| - |
|---|
| -/usr/local/include/pike |
|---|
| -/usr/local/include/pike7.6 |
|---|
| - |
|---|
| -/usr/local/lib/pike/site_pike |
|---|
| -/usr/local/lib/pike7.6/site_pike |
|---|
| - |
|---|
| -/usr/local/share/pike/site_pike |
|---|
| -/usr/local/share/pike7.6/site_pike |
|---|
| - |
|---|
| -Note: I have come to the conclusion that this structure isn't awfully |
|---|
| -well though through. It is likely to change, but probably not until |
|---|
| -Pike 7.8. What's missing is a working infrastructure for building and |
|---|
| -installing third-pary modules and applications so that they won't have |
|---|
| -to be rebuilt for each new Pike revision, similarly to Perl and/or |
|---|
| -Python. Stay tuned. |
|---|
| - |
|---|
| ----- |
|---|
| -$Id$ |
|---|
| - |
|---|
| - -- Magnus Holmgren <magnus@kibibyte.se>, Fri, 21 Dec 2007 09:43:18 +0100 |
|---|
| /7.8.316-dfsg-1/debian/README.Debian |
|---|
| Property changes: |
|---|
| Deleted: svn:keywords |
|---|
| ## -1 +0,0 ## |
|---|
| -Id |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/control |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/control (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/control (nonexistent) |
|---|
| @@ -1,253 +0,0 @@ |
|---|
| -Source: pike7.8 |
|---|
| -Section: interpreters |
|---|
| -Priority: optional |
|---|
| -Maintainer: Magnus Holmgren <holmgren@debian.org> |
|---|
| -Uploaders: Henrik Andreasson <debian@han.pp.se> |
|---|
| -Standards-Version: 3.8.3 |
|---|
| -Build-Depends: debhelper (>= 5), dpatch, bison, sharutils, bc, pkg-config, |
|---|
| - libgmp3-dev, nettle-dev, |
|---|
| - zlib1g-dev | libz-dev, libbz2-dev, |
|---|
| - libgdbm-dev, libiodbc2-dev, libmysqlclient15-dev, libpq-dev, libsqlite3-dev, |
|---|
| - libpcre3-dev, |
|---|
| - libsdl-mixer1.2-dev, libsdl1.2-dev, libsane-dev, |
|---|
| - x11proto-gl-dev, libxpm-dev, libglade2-dev, libfreetype6-dev, |
|---|
| - freeglut3-dev, libjpeg-dev, libtiff4-dev, librsvg2-dev (>= 2.7), |
|---|
| - gnome-core-devel, libgtkhtml2-dev, libfuse-dev, |
|---|
| - libfftw3-dev, libavahi-compat-libdnssd-dev |
|---|
| -Build-Conflicts: libutahglx-dev |
|---|
| -Homepage: http://pike.ida.liu.se/ |
|---|
| -Vcs-Svn: svn://svn.debian.org/pkg-pike/trunk |
|---|
| -Vcs-Browser: http://svn.debian.org/pkg-pike |
|---|
| - |
|---|
| -Package: pike7.8-core |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends} |
|---|
| -Suggests: pike7.8-doc |
|---|
| -Recommends: pike7.8-image (= ${source:Version}) |
|---|
| -Description: Powerful interpreted programming language |
|---|
| - Pike is an interpreted, object-oriented, dynamic programming language |
|---|
| - with a syntax similar to C. It includes many powerful data types and |
|---|
| - a module system that, for instance, provides image manipulation together, |
|---|
| - with support for graphics formats like SVG, JPG, PNG, GIF, XCF and many |
|---|
| - others, database connectivity, advanced cryptography, XML/HTML parsers |
|---|
| - and others. To learn more about pike, please visit http://pike.ida.liu.se/ |
|---|
| - Note that some of the Pike features are found in other pike7.8-* packages |
|---|
| - (image processing, MySQL, PostgreSQL, SANE and more). |
|---|
| - |
|---|
| -Package: pike7.8 |
|---|
| -Architecture: all |
|---|
| -Depends: pike7.8-core (>= ${source:Version}), pike7.8-image (>= ${source:Version}), pike7.8-gdbm (>= ${source:Version}) |
|---|
| -Recommends: pike7.8-doc (= ${source:Version}) |
|---|
| -Suggests: pike7.8-mysql (>= ${source:Version}), pike7.8-pg (>= ${source:Version}), pike7.8-dev (>= ${source:Version}) |
|---|
| -Description: Recommended metapackage for Pike 7.8 |
|---|
| - This is a metapackage which depends upon several other Pike |
|---|
| - packages that together make up the recommended Pike installation. |
|---|
| - If you want to install every packaged component of the Pike |
|---|
| - distribution, please install the pike7.8-full package. |
|---|
| - . |
|---|
| - If you want to remove several components this package depends |
|---|
| - upon, you can purge this package without worrying about the |
|---|
| - functionality loss in Pike and then remove the packages you |
|---|
| - don't need on your system. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-dev |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (>= ${source:Version}) |
|---|
| -Description: Development files for Pike 7.8 |
|---|
| - This package contains files you will need to develop C extension modules |
|---|
| - for Pike. The package depends on the recommended set of packages for the |
|---|
| - Pike environment. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-manual |
|---|
| -Architecture: all |
|---|
| -Section: doc |
|---|
| -Description: Pike 7.8 manual |
|---|
| - The Pike manual auto-generated from the sources. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-reference |
|---|
| -Architecture: all |
|---|
| -Section: doc |
|---|
| -Description: Pike 7.8 reference |
|---|
| - The Pike reference auto-generated from the sources. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-doc |
|---|
| -Architecture: all |
|---|
| -Section: doc |
|---|
| -Depends: pike7.8-manual (= ${source:Version}), pike7.8-reference (= ${source:Version}) |
|---|
| -Description: Pike 7.8 documentation metapackage |
|---|
| - This package depends upon all the Pike 7.8 documentation packages. Note |
|---|
| - that the download and installation sizes might be very large. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-full |
|---|
| -Architecture: all |
|---|
| -Depends: pike7.8 (= ${source:Version}), pike7.8-mysql (>= ${source:Version}), pike7.8-pg (>= ${source:Version}), pike7.8-odbc (>= ${source:Version}), pike7.8-image (>= ${source:Version}), pike7.8-sdl (>= ${source:Version}), pike7.8-gdbm (>= ${source:Version}), pike7.8-gtk (>= ${source:Version}), pike7.8-gl (>= ${source:Version}), pike7.8-sane (>= ${source:Version}), pike7.8-doc (= ${source:Version}), pike7.8-dev (>= ${source:Version}), pike7.8-svg (>= ${source:Version}), pike7.8-pcre (>= ${source:Version}), pike7.8-bzip2 (>= ${source:Version}), pike7.8-fuse (>= ${source:Version}), pike7.8-sqlite (>= ${source:Version}), pike7.8-dnssd (>= ${source:Version}) |
|---|
| -Description: Metapackage for Pike 7.8 |
|---|
| - This package depends on all the components that make up the Pike |
|---|
| - language distribution. It will pull in a LOT of packages the |
|---|
| - Pike components depend upon (including XFree libraries, GTK+, GNOME)! |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-mysql |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: MySQL module for Pike |
|---|
| - This Pike module provides access to MySQL databases. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-pg |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: PostgreSQL module for Pike |
|---|
| - This Pike module provides access to PostgreSQL databases. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-odbc |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: ODBC module for Pike |
|---|
| - This Pike module provides glue to the iODBC interface. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-svg |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Suggests: pike7.8-image (= ${source:Version}) |
|---|
| -Description: SVG format support for Pike |
|---|
| - This module provides an SVG graphics format module. It has |
|---|
| - been separated from the pike7.8-image module because of its |
|---|
| - quite extensive dependencies. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-image |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Suggests: pike7.8-svg (= ${source:Version}) |
|---|
| -Description: Image module for Pike |
|---|
| - This module provides many powerful image processing functions to |
|---|
| - Pike programs. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-sdl |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: SDL module for Pike |
|---|
| - This module provides the Pike interface to the SDL library. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-gdbm |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: Gdbm module for Pike |
|---|
| - This Pike module provides access to gdbm databases. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-gtk |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: GTK module for Pike |
|---|
| - This Pike module provides access to the GTK+ library. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-gl |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: Mesa module for Pike |
|---|
| - This Pike module provides access to the Mesa 3D graphics library. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-sane |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: SANE module for Pike |
|---|
| - This Pike module provides access to SANE. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-pcre |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: PCRE module for Pike |
|---|
| - This Pike module enables one to use the PCRE (Perl regular |
|---|
| - expressions) from within the Pike programs. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-bzip2 |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: Bzip2 module for Pike |
|---|
| - This Pike module enables one to use the Bzip2 compression |
|---|
| - algorithm from within the Pike programs. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-fuse |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: Filesystem in USErspace support for Pike |
|---|
| - This Pike module enables one to export filesystems to the Linux |
|---|
| - kernel using the FUSE library. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-sqlite |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: SQLite module for Pike |
|---|
| - This Pike module enables one to use the SQLite embedded database |
|---|
| - library. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| -Package: pike7.8-dnssd |
|---|
| -Architecture: any |
|---|
| -Depends: ${shlibs:Depends}, pike7.8-core (= ${binary:Version}) |
|---|
| -Description: DNS Service Discovery (DNS-SD) for Pike |
|---|
| - This Pike module enables one to take advantage of DNS service discovery. |
|---|
| - . |
|---|
| - DNS Service Discovery is a way of using standard DNS programming interfaces, |
|---|
| - servers, and packet formats to browse the network for services. |
|---|
| - . |
|---|
| - Pike is an interpreted programming language, for more information |
|---|
| - see the description of the pike7.8-core package. |
|---|
| - |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-pcre.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-pcre.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-pcre.install (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*Regexp_PCRE.* |
|---|
| -#usr/share/pike/*/modules/*Regexp_PCRE.* |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/nettle_2.0.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/nettle_2.0.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/nettle_2.0.dpatch (nonexistent) |
|---|
| @@ -1,1541 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 02_smartlink_rpath.dpatch |
|---|
| -## |
|---|
| -## DP: Changes from CVS to make the Nettle module compile with Nettle 2.0 |
|---|
| -## DP: Unfortunately Pike 7.8 doesn't support precompilation of C modules |
|---|
| -## DP: without an already installed Pike. |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| - |
|---|
| -diff -urad Pike-v7.8.316/src/post_modules/Nettle/cipher.cmod pike-cvs/7.8/src/post_modules/Nettle/cipher.cmod |
|---|
| ---- Pike-v7.8.316/src/post_modules/Nettle/cipher.cmod 2008-07-31 16:52:27.000000000 +0200 |
|---|
| -+++ pike-cvs/7.8/src/post_modules/Nettle/cipher.cmod 2009-07-02 18:35:38.000000000 +0200 |
|---|
| -@@ -79,8 +86,8 @@ |
|---|
| - pike_nettle_set_key_func set_encrypt_key; |
|---|
| - pike_nettle_set_key_func set_decrypt_key; |
|---|
| - |
|---|
| -- nettle_crypt_func encrypt; |
|---|
| -- nettle_crypt_func decrypt; |
|---|
| -+ nettle_crypt_func *encrypt; |
|---|
| -+ nettle_crypt_func *decrypt; |
|---|
| - }; |
|---|
| - |
|---|
| - #define _PIKE_CIPHER(name, NAME) { \ |
|---|
| -@@ -90,8 +97,8 @@ |
|---|
| - NAME##_KEY_SIZE, \ |
|---|
| - pike_##name##_set_encrypt_key, \ |
|---|
| - pike_##name##_set_decrypt_key, \ |
|---|
| -- (nettle_crypt_func) name##_encrypt, \ |
|---|
| -- (nettle_crypt_func) name##_decrypt, \ |
|---|
| -+ (nettle_crypt_func*) name##_encrypt, \ |
|---|
| -+ (nettle_crypt_func*) name##_decrypt, \ |
|---|
| - } |
|---|
| - |
|---|
| - /*! @class CipherInfo |
|---|
| -@@ -175,7 +182,7 @@ |
|---|
| - PIKECLASS CipherState |
|---|
| - { |
|---|
| - INHERIT CipherInfo; |
|---|
| -- CVAR nettle_crypt_func crypt; |
|---|
| -+ CVAR nettle_crypt_func *crypt; |
|---|
| - CVAR void *ctx; |
|---|
| - CVAR int key_size; |
|---|
| - |
|---|
| -diff -urad Pike-v7.8.316/src/post_modules/Nettle/nettle.cmod pike-cvs/7.8/src/post_modules/Nettle/nettle.cmod |
|---|
| ---- Pike-v7.8.316/src/post_modules/Nettle/nettle.cmod 2008-06-29 00:57:14.000000000 +0200 |
|---|
| -+++ pike-cvs/7.8/src/post_modules/Nettle/nettle.cmod 2009-07-05 21:41:58.000000000 +0200 |
|---|
| -@@ -46,6 +46,21 @@ |
|---|
| - CVAR struct yarrow256_ctx ctx; |
|---|
| - CVAR struct yarrow_source *sources; |
|---|
| - |
|---|
| -+ PIKEVAR string seed_file flags ID_PRIVATE|ID_STATIC; |
|---|
| -+ |
|---|
| -+ DECLARE_STORAGE; |
|---|
| -+ |
|---|
| -+ static void pike_generate_seed_file(void) |
|---|
| -+ { |
|---|
| -+ struct pike_string *seed_file = |
|---|
| -+ begin_shared_string(YARROW256_SEED_FILE_SIZE); |
|---|
| -+ yarrow256_random(&THIS->ctx, YARROW256_SEED_FILE_SIZE, STR0(seed_file)); |
|---|
| -+ if (THIS->seed_file) { |
|---|
| -+ free_string(THIS->seed_file); |
|---|
| -+ } |
|---|
| -+ THIS->seed_file = end_shared_string(seed_file); |
|---|
| -+ } |
|---|
| -+ |
|---|
| - /*! @decl void create(void|int sources) |
|---|
| - *! The number of entropy sources that will feed entropy to the |
|---|
| - *! random number generator is given as an argument to Yarrow |
|---|
| -@@ -90,10 +120,12 @@ |
|---|
| - optflags OPT_SIDE_EFFECT; |
|---|
| - { |
|---|
| - if(data->len < YARROW256_SEED_FILE_SIZE) |
|---|
| -- Pike_error( "Seed must be at least 32 characters.\n" ); |
|---|
| -+ Pike_error("Seed must be at least %d characters.\n", |
|---|
| -+ YARROW256_SEED_FILE_SIZE); |
|---|
| - |
|---|
| - NO_WIDE_STRING(data); |
|---|
| -- yarrow256_seed(&THIS->ctx, data->len, (const uint8_t *)data->str); |
|---|
| -+ yarrow256_seed(&THIS->ctx, data->len, STR0(data)); |
|---|
| -+ pike_generate_seed_file(); |
|---|
| - RETURN this_object(); |
|---|
| - } |
|---|
| - |
|---|
| -@@ -109,19 +141,26 @@ |
|---|
| - RETURN YARROW256_SEED_FILE_SIZE; |
|---|
| - } |
|---|
| - |
|---|
| -- /*! @decl string get_seed() |
|---|
| -- *! Returns part of the internal state so that it can |
|---|
| -- *! be saved for later seeding. |
|---|
| -+ /*! @decl string(0..255) get_seed() |
|---|
| -+ *! Returns part of the internal state so that it can |
|---|
| -+ *! be saved for later seeding. |
|---|
| -+ *! |
|---|
| - *! @seealso |
|---|
| -- *! @[seed] |
|---|
| -+ *! @[seed()], @[random_string()] |
|---|
| - */ |
|---|
| - PIKEFUN string get_seed() |
|---|
| - optflags OPT_EXTERNAL_DEPEND; |
|---|
| -+ rawtype tDeprecated(tFunc(tNone, tStr8)); |
|---|
| - { |
|---|
| - if( !yarrow256_is_seeded(&THIS->ctx) ) |
|---|
| - Pike_error("Random generator not seeded.\n"); |
|---|
| -- RETURN make_shared_binary_string((const char *)THIS->ctx.seed_file, |
|---|
| -- YARROW256_SEED_FILE_SIZE); |
|---|
| -+ |
|---|
| -+ if (THIS->seed_file) { |
|---|
| -+ REF_RETURN THIS->seed_file; |
|---|
| -+ } else { |
|---|
| -+ struct pike_string *s = begin_shared_string(YARROW256_SEED_FILE_SIZE); |
|---|
| -+ RETURN end_shared_string(s); |
|---|
| -+ } |
|---|
| - } |
|---|
| - |
|---|
| - /*! @decl int(0..1) is_seeded() |
|---|
| -@@ -144,7 +188,8 @@ |
|---|
| - PIKEFUN void force_reseed() |
|---|
| - optflags OPT_SIDE_EFFECT; |
|---|
| - { |
|---|
| -- yarrow256_force_reseed(&THIS->ctx); |
|---|
| -+ yarrow256_slow_reseed(&THIS->ctx); |
|---|
| -+ pike_generate_seed_file(); |
|---|
| - } |
|---|
| - |
|---|
| - /*! @decl int(0..1) update(string data, int source, int entropy) |
|---|
| -@@ -156,6 +212,7 @@ |
|---|
| - PIKEFUN int(0..1) update(string data, int source, int entropy) |
|---|
| - optflags OPT_SIDE_EFFECT; |
|---|
| - { |
|---|
| -+ int ret; |
|---|
| - /* FIXME: Wide strings could actually be supported here */ |
|---|
| - NO_WIDE_STRING(data); |
|---|
| - if( !THIS->sources ) |
|---|
| -@@ -166,8 +223,11 @@ |
|---|
| - Pike_error("Entropy must be positive.\n"); |
|---|
| - if( entropy>(data->len*8) ) |
|---|
| - Pike_error("Impossibly large entropy value.\n"); |
|---|
| -- RETURN yarrow256_update(&THIS->ctx, source, entropy, data->len, |
|---|
| -- (const uint8_t *)data->str); |
|---|
| -+ ret = yarrow256_update(&THIS->ctx, source, entropy, data->len, |
|---|
| -+ (const uint8_t *)data->str); |
|---|
| -+ if (ret) |
|---|
| -+ pike_generate_seed_file(); |
|---|
| -+ RETURN ret; |
|---|
| - } |
|---|
| - |
|---|
| - /*! @decl int(0..) needed_sources() |
|---|
| -diff -urad Pike-v7.8.316/src/post_modules/Nettle/testsuite.in pike-cvs/7.8/src/post_modules/Nettle/testsuite.in |
|---|
| ---- Pike-v7.8.316/src/post_modules/Nettle/testsuite.in 2007-06-18 02:43:51.000000000 +0200 |
|---|
| -+++ pike-cvs/7.8/src/post_modules/Nettle/testsuite.in 2009-08-05 12:01:45.000000000 +0200 |
|---|
| -@@ -193,4 +193,14 @@ |
|---|
| - } |
|---|
| - ) |
|---|
| - ]]) |
|---|
| -+ |
|---|
| -+cond_resolv( Nettle.Yarrow, [[ |
|---|
| -+ test_any_equal([[ |
|---|
| -+ object y = Nettle.Yarrow()->seed("What happen? Somebody set up us the bomb."); |
|---|
| -+ return ({ y->get_seed(), y->random_string(20), y->get_seed(), y->random_string(20) }); |
|---|
| -+ ]], [[({String.hex2string("73a35b2f896a8061be0ad434a592a43a82b81b9ed6c018f1c5a51300bbc8d53d"), |
|---|
| -+ String.hex2string("7847458e32fb789ff6b6cd6e1c8cc3712ba532a8"), |
|---|
| -+ String.hex2string("73a35b2f896a8061be0ad434a592a43a82b81b9ed6c018f1c5a51300bbc8d53d"), |
|---|
| -+ String.hex2string("49a090656a6d93782e169994f41005a3616d3cd7")})]]) |
|---|
| -+]]) |
|---|
| - END_MARKER |
|---|
| ---- Pike-v7.8.316/src/post_modules/Nettle/nettle.c 2009-05-17 00:54:13.000000000 +0200 |
|---|
| -+++ pike-cvs/7.8/src/post_modules/Nettle/nettle.c 2009-08-22 21:24:50.000000000 +0200 |
|---|
| -@@ -64,6 +64,9 @@ |
|---|
| - #undef var_sources_Yarrow_defined |
|---|
| - #define var_sources_Yarrow_defined |
|---|
| - |
|---|
| -+#undef var_seed_file_Yarrow_defined |
|---|
| -+#define var_seed_file_Yarrow_defined |
|---|
| -+ |
|---|
| - #undef THIS |
|---|
| - #define THIS ((struct Yarrow_struct *)(Pike_interpreter.frame_pointer->current_storage)) |
|---|
| - |
|---|
| -@@ -79,12 +82,31 @@ |
|---|
| - #line 47 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct yarrow_source *sources; |
|---|
| - #endif /* var_sources_Yarrow_defined */ |
|---|
| -+ |
|---|
| -+#ifdef var_seed_file_Yarrow_defined |
|---|
| -+ struct pike_string * seed_file; |
|---|
| -+ |
|---|
| -+#endif /* var_seed_file_Yarrow_defined */ |
|---|
| - }; |
|---|
| - #ifdef PIKE_DEBUG |
|---|
| - /* Ensure the struct is used in a variable declaration, or else gdb might not see it. */ |
|---|
| - static struct Yarrow_struct *Yarrow_gdb_dummy_ptr; |
|---|
| - #endif |
|---|
| --/*! @decl void create(void|int sources) |
|---|
| -+#line 51 "src/post_modules/Nettle/nettle.cmod" |
|---|
| -+; |
|---|
| -+ |
|---|
| -+ static void pike_generate_seed_file(void) |
|---|
| -+ { |
|---|
| -+ struct pike_string *seed_file = |
|---|
| -+ begin_shared_string(YARROW256_SEED_FILE_SIZE); |
|---|
| -+ yarrow256_random(&THIS->ctx, YARROW256_SEED_FILE_SIZE, STR0(seed_file)); |
|---|
| -+ if (THIS->seed_file) { |
|---|
| -+ free_string(THIS->seed_file); |
|---|
| -+ } |
|---|
| -+ THIS->seed_file = end_shared_string(seed_file); |
|---|
| -+ } |
|---|
| -+ |
|---|
| -+ /*! @decl void create(void|int sources) |
|---|
| - *! The number of entropy sources that will feed entropy to the |
|---|
| - *! random number generator is given as an argument to Yarrow |
|---|
| - *! during instantiation. |
|---|
| -@@ -102,19 +124,19 @@ |
|---|
| - #define f_Yarrow_create_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_create_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_create(INT32 args) { |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct svalue * arg; |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args > 1) wrong_number_of_args_error("create",args,1); |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if (args > 0) { |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-args].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("create",1,"void|int"); |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - arg=Pike_sp+0-args; dmalloc_touch_svalue(Pike_sp+0-args); |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } else arg = NULL; |
|---|
| --#line 58 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 73 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - INT32 num = 0; |
|---|
| - |
|---|
| -@@ -150,23 +172,25 @@ |
|---|
| - #define f_Yarrow_seed_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_seed_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_seed(INT32 args) { |
|---|
| --#line 89 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 104 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * data; |
|---|
| --#line 89 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 104 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("seed",args,1); |
|---|
| --#line 89 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 104 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("seed",1,"string"); |
|---|
| --#line 89 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 104 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(data=Pike_sp[0-1].u.string); |
|---|
| --#line 91 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 106 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - if(data->len < YARROW256_SEED_FILE_SIZE) |
|---|
| -- Pike_error( "Seed must be at least 32 characters.\n" ); |
|---|
| -+ Pike_error("Seed must be at least %d characters.\n", |
|---|
| -+ YARROW256_SEED_FILE_SIZE); |
|---|
| - |
|---|
| - NO_WIDE_STRING(data); |
|---|
| -- yarrow256_seed(&THIS->ctx, data->len, (const uint8_t *)data->str); |
|---|
| -+ yarrow256_seed(&THIS->ctx, data->len, STR0(data)); |
|---|
| -+ pike_generate_seed_file(); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 98 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 115 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -179,34 +203,41 @@ |
|---|
| - #define f_Yarrow_min_seed_size_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_min_seed_size_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_min_seed_size(INT32 args) { |
|---|
| --#line 106 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 123 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("min_seed_size",args,0); |
|---|
| --#line 108 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 125 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(YARROW256_SEED_FILE_SIZE); push_int(ret_); return; }while(0); |
|---|
| --#line 110 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 127 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| --/*! @decl string get_seed() |
|---|
| -- *! Returns part of the internal state so that it can |
|---|
| -- *! be saved for later seeding. |
|---|
| -+/*! @decl string(0..255) get_seed() |
|---|
| -+ *! Returns part of the internal state so that it can |
|---|
| -+ *! be saved for later seeding. |
|---|
| -+ *! |
|---|
| - *! @seealso |
|---|
| -- *! @[seed] |
|---|
| -+ *! @[seed()], @[random_string()] |
|---|
| - */ |
|---|
| - #define f_Yarrow_get_seed_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_get_seed_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_get_seed(INT32 args) { |
|---|
| --#line 118 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 136 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("get_seed",args,0); |
|---|
| --#line 120 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 139 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - if( !yarrow256_is_seeded(&THIS->ctx) ) |
|---|
| - Pike_error("Random generator not seeded.\n"); |
|---|
| -- do { struct pike_string * ret_=(make_shared_binary_string((const char *)THIS->ctx.seed_file, |
|---|
| -- YARROW256_SEED_FILE_SIZE)); push_string(ret_); return; }while(0); |
|---|
| --#line 125 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+ |
|---|
| -+ if (THIS->seed_file) { |
|---|
| -+ do { struct pike_string * ret_=(THIS->seed_file); add_ref(ret_); push_string(ret_); return; }while(0); |
|---|
| -+#line 145 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+} else { |
|---|
| -+ struct pike_string *s = begin_shared_string(YARROW256_SEED_FILE_SIZE); |
|---|
| -+ do { struct pike_string * ret_=(end_shared_string(s)); push_string(ret_); return; }while(0); |
|---|
| -+#line 148 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| -+ } |
|---|
| - |
|---|
| - } |
|---|
| - /*! @decl int(0..1) is_seeded() |
|---|
| -@@ -218,12 +249,12 @@ |
|---|
| - #define f_Yarrow_is_seeded_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_is_seeded_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_is_seeded(INT32 args) { |
|---|
| --#line 133 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 157 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("is_seeded",args,0); |
|---|
| --#line 135 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 159 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(yarrow256_is_seeded(&THIS->ctx)); push_int(ret_); return; }while(0); |
|---|
| --#line 137 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 161 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -235,11 +266,12 @@ |
|---|
| - #define f_Yarrow_force_reseed_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_force_reseed_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_force_reseed(INT32 args) { |
|---|
| --#line 144 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 168 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("force_reseed",args,0); |
|---|
| --#line 146 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 170 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| -- yarrow256_force_reseed(&THIS->ctx); |
|---|
| -+ yarrow256_slow_reseed(&THIS->ctx); |
|---|
| -+ pike_generate_seed_file(); |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -252,28 +284,29 @@ |
|---|
| - #define f_Yarrow_update_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_update_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_update(INT32 args) { |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * data; |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE source; |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE entropy; |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 3) wrong_number_of_args_error("update",args,3); |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-3].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("update",1,"string"); |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(data=Pike_sp[0-3].u.string); |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[1-3].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("update",2,"int"); |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - source=Pike_sp[1-3].u.integer; |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[2-3].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("update",3,"int"); |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - entropy=Pike_sp[2-3].u.integer; |
|---|
| --#line 158 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 183 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| -+ int ret; |
|---|
| - /* FIXME: Wide strings could actually be supported here */ |
|---|
| - NO_WIDE_STRING(data); |
|---|
| - if( !THIS->sources ) |
|---|
| -@@ -284,9 +317,12 @@ |
|---|
| - Pike_error("Entropy must be positive.\n"); |
|---|
| - if( entropy>(data->len*8) ) |
|---|
| - Pike_error("Impossibly large entropy value.\n"); |
|---|
| -- do { INT_TYPE ret_=(yarrow256_update(&THIS->ctx, source, entropy, data->len, |
|---|
| -- (const uint8_t *)data->str)); pop_n_elems(3); push_int(ret_); return; }while(0); |
|---|
| --#line 171 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+ ret = yarrow256_update(&THIS->ctx, source, entropy, data->len, |
|---|
| -+ (const uint8_t *)data->str); |
|---|
| -+ if (ret) |
|---|
| -+ pike_generate_seed_file(); |
|---|
| -+ do { INT_TYPE ret_=(ret); pop_n_elems(3); push_int(ret_); return; }while(0); |
|---|
| -+#line 200 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -297,12 +333,12 @@ |
|---|
| - #define f_Yarrow_needed_sources_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_needed_sources_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_needed_sources(INT32 args) { |
|---|
| --#line 177 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 206 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("needed_sources",args,0); |
|---|
| --#line 179 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 208 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(yarrow256_needed_sources(&THIS->ctx)); push_int(ret_); return; }while(0); |
|---|
| --#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 210 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -312,15 +348,15 @@ |
|---|
| - #define f_Yarrow_random_string_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Yarrow_random_string_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Yarrow_random_string(INT32 args) { |
|---|
| --#line 186 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 215 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE length; |
|---|
| --#line 186 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 215 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("random_string",args,1); |
|---|
| --#line 186 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 215 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("random_string",1,"int"); |
|---|
| --#line 186 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 215 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - length=Pike_sp[0-1].u.integer; |
|---|
| --#line 188 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 217 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - struct pike_string *rnd; |
|---|
| - if(length < 0) |
|---|
| -@@ -330,7 +366,7 @@ |
|---|
| - rnd = begin_shared_string(length); |
|---|
| - yarrow256_random(&THIS->ctx, length, (uint8_t *)rnd->str); |
|---|
| - do { struct pike_string * ret_=(end_shared_string(rnd)); pop_stack(); push_string(ret_); return; }while(0); |
|---|
| --#line 197 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 226 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -341,7 +377,7 @@ |
|---|
| - #undef Yarrow_event_handler_defined |
|---|
| - #define Yarrow_event_handler_defined |
|---|
| - static void init_Yarrow_struct(void) |
|---|
| --#line 200 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 229 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - THIS->sources = NULL; |
|---|
| - yarrow256_init(&THIS->ctx, 0, NULL); |
|---|
| -@@ -354,7 +390,7 @@ |
|---|
| - #undef Yarrow_event_handler_defined |
|---|
| - #define Yarrow_event_handler_defined |
|---|
| - static void exit_Yarrow_struct(void) |
|---|
| --#line 207 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 236 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - if( THIS->sources ) |
|---|
| - { |
|---|
| -@@ -390,21 +426,21 @@ |
|---|
| - #define f_crypt_md5_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_crypt_md5_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_crypt_md5(INT32 args) { |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * pw; |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * salt; |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 2) wrong_number_of_args_error("crypt_md5",args,2); |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-2].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("crypt_md5",1,"string"); |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(pw=Pike_sp[0-2].u.string); |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[1-2].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("crypt_md5",2,"string"); |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(salt=Pike_sp[1-2].u.string); |
|---|
| --#line 224 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 253 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - char *hash; |
|---|
| - NO_WIDE_STRING(pw); |
|---|
| -@@ -417,7 +453,7 @@ |
|---|
| - |
|---|
| - |
|---|
| - } |
|---|
| --#line 235 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 264 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - static const char *crypto_functions[] = { |
|---|
| - "block_size", |
|---|
| - "key_size", |
|---|
| -@@ -529,22 +565,22 @@ |
|---|
| - struct CBC_struct { |
|---|
| - |
|---|
| - #ifdef var_object_CBC_defined |
|---|
| --#line 315 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 344 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct object *object; |
|---|
| - #endif /* var_object_CBC_defined */ |
|---|
| - |
|---|
| - #ifdef var_iv_CBC_defined |
|---|
| --#line 316 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 345 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - unsigned INT8 *iv; |
|---|
| - #endif /* var_iv_CBC_defined */ |
|---|
| - |
|---|
| - #ifdef var_block_size_CBC_defined |
|---|
| --#line 317 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 346 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT32 block_size; |
|---|
| - #endif /* var_block_size_CBC_defined */ |
|---|
| - |
|---|
| - #ifdef var_mode_CBC_defined |
|---|
| --#line 318 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 347 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT32 mode; |
|---|
| - #endif /* var_mode_CBC_defined */ |
|---|
| - }; |
|---|
| -@@ -559,7 +595,7 @@ |
|---|
| - #undef CBC_event_handler_defined |
|---|
| - #define CBC_event_handler_defined |
|---|
| - static void init_CBC_struct(void) |
|---|
| --#line 321 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 350 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - THIS->object = NULL; |
|---|
| - THIS->iv = NULL; |
|---|
| -@@ -574,7 +610,7 @@ |
|---|
| - #undef CBC_event_handler_defined |
|---|
| - #define CBC_event_handler_defined |
|---|
| - static void exit_CBC_struct(void) |
|---|
| --#line 330 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 359 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - if(THIS->object) { |
|---|
| - free_object(THIS->object); |
|---|
| -@@ -643,24 +679,24 @@ |
|---|
| - #define f_CBC_create_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_create_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_create(INT32 args) { |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct svalue * cipher; |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct svalue * more; |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args < 1) wrong_number_of_args_error("create",args,1); |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - cipher=Pike_sp+0-args; dmalloc_touch_svalue(Pike_sp+0-args); |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if (args > 1) { |
|---|
| - INT32 argcnt = 0; |
|---|
| - do { |
|---|
| - dmalloc_touch_svalue(Pike_sp+1+argcnt-args); |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } while (++argcnt < args-1); |
|---|
| - more=Pike_sp+1-args; |
|---|
| - } else more=0; |
|---|
| --#line 397 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 426 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - int old_block_size = THIS->block_size; |
|---|
| - THIS->object = make_cipher_object(args); |
|---|
| -@@ -694,9 +730,9 @@ |
|---|
| - #define f_CBC_name_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_name_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_name(INT32 args) { |
|---|
| --#line 426 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 455 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("name",args,0); |
|---|
| --#line 428 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - push_constant_text("CBC("); |
|---|
| - safe_apply(THIS->object, "name", 0); |
|---|
| -@@ -711,12 +747,12 @@ |
|---|
| - #define f_CBC_block_size_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_block_size_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_block_size(INT32 args) { |
|---|
| --#line 438 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 467 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("block_size",args,0); |
|---|
| --#line 440 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 469 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(THIS->block_size); push_int(ret_); return; }while(0); |
|---|
| --#line 442 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -726,9 +762,9 @@ |
|---|
| - #define f_CBC_key_size_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_key_size_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_key_size(INT32 args) { |
|---|
| --#line 447 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 476 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("key_size",args,0); |
|---|
| --#line 449 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 478 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - safe_apply(THIS->object, "key_size", args); |
|---|
| - } |
|---|
| -@@ -741,22 +777,22 @@ |
|---|
| - #define f_CBC_set_encrypt_key_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_set_encrypt_key_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_set_encrypt_key(INT32 args) { |
|---|
| --#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * key; |
|---|
| --#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("set_encrypt_key",args,1); |
|---|
| --#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("set_encrypt_key",1,"string"); |
|---|
| --#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(key=Pike_sp[0-1].u.string); |
|---|
| --#line 459 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 488 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - assert(THIS->block_size); |
|---|
| - THIS->mode = 0; |
|---|
| - safe_apply(THIS->object, "set_encrypt_key", args); |
|---|
| - pop_stack(); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 465 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 494 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -767,22 +803,22 @@ |
|---|
| - #define f_CBC_set_decrypt_key_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_set_decrypt_key_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_set_decrypt_key(INT32 args) { |
|---|
| --#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 500 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * key; |
|---|
| --#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 500 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("set_decrypt_key",args,1); |
|---|
| --#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 500 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("set_decrypt_key",1,"string"); |
|---|
| --#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 500 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(key=Pike_sp[0-1].u.string); |
|---|
| --#line 473 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 502 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - assert(THIS->block_size); |
|---|
| - THIS->mode = 1; |
|---|
| - safe_apply(THIS->object, "set_decrypt_key", args); |
|---|
| - pop_stack(); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 479 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 508 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -792,15 +828,15 @@ |
|---|
| - #define f_CBC_set_iv_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_set_iv_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_set_iv(INT32 args) { |
|---|
| --#line 484 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 513 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * iv; |
|---|
| --#line 484 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 513 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("set_iv",args,1); |
|---|
| --#line 484 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 513 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("set_iv",1,"string"); |
|---|
| --#line 484 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 513 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(iv=Pike_sp[0-1].u.string); |
|---|
| --#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 515 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - assert(THIS->iv); |
|---|
| - NO_WIDE_STRING(iv); |
|---|
| -@@ -808,7 +844,7 @@ |
|---|
| - Pike_error("Argument incompatible with cipher block size.\n"); |
|---|
| - MEMCPY(THIS->iv, iv->str, THIS->block_size); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 493 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 522 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -819,15 +855,15 @@ |
|---|
| - #define f_CBC_crypt_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_CBC_crypt_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_CBC_crypt(INT32 args) { |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * data; |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("crypt",args,1); |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("crypt",1,"string"); |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(data=Pike_sp[0-1].u.string); |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - unsigned INT8 *result; |
|---|
| - INT32 offset = 0; |
|---|
| -@@ -919,22 +955,22 @@ |
|---|
| - struct Proxy_struct { |
|---|
| - |
|---|
| - #ifdef var_object_Proxy_defined |
|---|
| --#line 540 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 569 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct object *object; |
|---|
| - #endif /* var_object_Proxy_defined */ |
|---|
| - |
|---|
| - #ifdef var_block_size_Proxy_defined |
|---|
| --#line 541 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 570 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - int block_size; |
|---|
| - #endif /* var_block_size_Proxy_defined */ |
|---|
| - |
|---|
| - #ifdef var_backlog_Proxy_defined |
|---|
| --#line 542 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - unsigned char *backlog; |
|---|
| - #endif /* var_backlog_Proxy_defined */ |
|---|
| - |
|---|
| - #ifdef var_backlog_len_Proxy_defined |
|---|
| --#line 543 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 572 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - int backlog_len; |
|---|
| - #endif /* var_backlog_len_Proxy_defined */ |
|---|
| - }; |
|---|
| -@@ -949,7 +985,7 @@ |
|---|
| - #undef Proxy_event_handler_defined |
|---|
| - #define Proxy_event_handler_defined |
|---|
| - static void init_Proxy_struct(void) |
|---|
| --#line 545 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 574 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - THIS->object = NULL; |
|---|
| - THIS->block_size = 0; |
|---|
| -@@ -964,7 +1000,7 @@ |
|---|
| - #undef Proxy_event_handler_defined |
|---|
| - #define Proxy_event_handler_defined |
|---|
| - static void exit_Proxy_struct(void) |
|---|
| --#line 554 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 583 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - if(THIS->backlog) { |
|---|
| - MEMSET(THIS->backlog, 0, THIS->block_size); |
|---|
| -@@ -985,24 +1021,24 @@ |
|---|
| - #define f_Proxy_create_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_create_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_create(INT32 args) { |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct svalue * cipher; |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct svalue * more; |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args < 1) wrong_number_of_args_error("create",args,1); |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - cipher=Pike_sp+0-args; dmalloc_touch_svalue(Pike_sp+0-args); |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if (args > 1) { |
|---|
| - INT32 argcnt = 0; |
|---|
| - do { |
|---|
| - dmalloc_touch_svalue(Pike_sp+1+argcnt-args); |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } while (++argcnt < args-1); |
|---|
| - more=Pike_sp+1-args; |
|---|
| - } else more=0; |
|---|
| --#line 573 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 602 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - THIS->object = make_cipher_object(args); |
|---|
| - |
|---|
| -@@ -1030,9 +1066,9 @@ |
|---|
| - #define f_Proxy_name_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_name_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_name(INT32 args) { |
|---|
| --#line 596 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 625 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("name",args,0); |
|---|
| --#line 598 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 627 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - push_constant_text("Proxy("); |
|---|
| - safe_apply(THIS->object, "name", 0); |
|---|
| -@@ -1048,12 +1084,12 @@ |
|---|
| - #define f_Proxy_block_size_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_block_size_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_block_size(INT32 args) { |
|---|
| --#line 609 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 638 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("block_size",args,0); |
|---|
| --#line 611 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 640 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(THIS->block_size); push_int(ret_); return; }while(0); |
|---|
| --#line 613 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 642 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -1064,9 +1100,9 @@ |
|---|
| - #define f_Proxy_key_size_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_key_size_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_key_size(INT32 args) { |
|---|
| --#line 619 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 648 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("key_size",args,0); |
|---|
| --#line 621 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 650 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - safe_apply(THIS->object, "key_size", args); |
|---|
| - } |
|---|
| -@@ -1082,22 +1118,22 @@ |
|---|
| - #define f_Proxy_set_encrypt_key_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_set_encrypt_key_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_set_encrypt_key(INT32 args) { |
|---|
| --#line 632 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 661 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * key; |
|---|
| --#line 632 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 661 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("set_encrypt_key",args,1); |
|---|
| --#line 632 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 661 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("set_encrypt_key",1,"string"); |
|---|
| --#line 632 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 661 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(key=Pike_sp[0-1].u.string); |
|---|
| --#line 634 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 663 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - MEMSET(THIS->backlog, 0, THIS->block_size); |
|---|
| - THIS->backlog_len = 0; |
|---|
| - safe_apply(THIS->object, "set_encrypt_key", args); |
|---|
| - pop_stack(); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 640 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 669 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -1111,22 +1147,22 @@ |
|---|
| - #define f_Proxy_set_decrypt_key_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_set_decrypt_key_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_set_decrypt_key(INT32 args) { |
|---|
| --#line 649 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 678 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * key; |
|---|
| --#line 649 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 678 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("set_decrypt_key",args,1); |
|---|
| --#line 649 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 678 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("set_decrypt_key",1,"string"); |
|---|
| --#line 649 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 678 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(key=Pike_sp[0-1].u.string); |
|---|
| --#line 651 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 680 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - MEMSET(THIS->backlog, 0, THIS->block_size); |
|---|
| - THIS->backlog_len = 0; |
|---|
| - safe_apply(THIS->object, "set_decrypt_key", args); |
|---|
| - pop_stack(); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 657 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 686 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| -@@ -1141,15 +1177,15 @@ |
|---|
| - #define f_Proxy_crypt_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_crypt_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_crypt(INT32 args) { |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * data; |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("crypt",args,1); |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("crypt",1,"string"); |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(data=Pike_sp[0-1].u.string); |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - unsigned char *result; |
|---|
| - ptrdiff_t roffset = 0; |
|---|
| -@@ -1232,9 +1268,9 @@ |
|---|
| - #define f_Proxy_pad_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_pad_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_pad(INT32 args) { |
|---|
| --#line 745 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 774 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("pad",args,0); |
|---|
| --#line 745 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 774 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - ptrdiff_t i; |
|---|
| - |
|---|
| -@@ -1266,15 +1302,15 @@ |
|---|
| - #define f_Proxy_unpad_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_Proxy_unpad_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_Proxy_unpad(INT32 args) { |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct pike_string * str; |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("unpad",args,1); |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_STRING) SIMPLE_ARG_TYPE_ERROR("unpad",1,"string"); |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - debug_malloc_pass(str=Pike_sp[0-1].u.string); |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - ptrdiff_t len; |
|---|
| - |
|---|
| -@@ -1327,7 +1363,7 @@ |
|---|
| - /*! @endclass |
|---|
| - */ |
|---|
| - |
|---|
| --#line 806 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 835 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - #if 0 |
|---|
| - |
|---|
| - /* @class LFib |
|---|
| -@@ -1359,7 +1395,7 @@ |
|---|
| - struct LFib_struct { |
|---|
| - |
|---|
| - #ifdef var_ctx_LFib_defined |
|---|
| --#line 815 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 844 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - struct knuth_lfib_ctx *ctx; |
|---|
| - #endif /* var_ctx_LFib_defined */ |
|---|
| - }; |
|---|
| -@@ -1374,7 +1410,7 @@ |
|---|
| - #undef LFib_event_handler_defined |
|---|
| - #define LFib_event_handler_defined |
|---|
| - static void init_LFib_struct(void) |
|---|
| --#line 817 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 846 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - THIS->ctx = xalloc(sizeof(struct knuth_lfib_ctx)); |
|---|
| - } |
|---|
| -@@ -1386,7 +1422,7 @@ |
|---|
| - #undef LFib_event_handler_defined |
|---|
| - #define LFib_event_handler_defined |
|---|
| - static void exit_LFib_struct(void) |
|---|
| --#line 823 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 852 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - free(THIS->ctx); |
|---|
| - } |
|---|
| -@@ -1397,21 +1433,21 @@ |
|---|
| - #define f_LFib_create_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_LFib_create_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_LFib_create(INT32 args) { |
|---|
| --#line 830 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 859 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE seed; |
|---|
| --#line 830 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 859 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("create",args,1); |
|---|
| --#line 830 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 859 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("create",1,"int"); |
|---|
| --#line 830 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 859 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - seed=Pike_sp[0-1].u.integer; |
|---|
| --#line 832 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 861 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - knuth_lfib_init(THIS->ctx, seed); |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| --#line 836 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 865 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - /* @decl this_program reseed(int s) |
|---|
| - * Reseed this object with seed @[s]. |
|---|
| - * @return |
|---|
| -@@ -1420,52 +1456,52 @@ |
|---|
| - #define f_LFib_reseed_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_LFib_reseed_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_LFib_reseed(INT32 args) { |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE s; |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("reseed",args,1); |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("reseed",1,"int"); |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - s=Pike_sp[0-1].u.integer; |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - knuth_lfib_init(THIS->ctx, s); |
|---|
| - do { struct object * ret_=(this_object()); pop_stack(); push_object(ret_); return; }while(0); |
|---|
| --#line 844 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 873 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| --#line 846 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 875 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - /* Get one 32bit pseudorandom integer. |
|---|
| - */ |
|---|
| - #define f_LFib_get_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_LFib_get_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_LFib_get(INT32 args) { |
|---|
| --#line 848 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 877 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 0) wrong_number_of_args_error("get",args,0); |
|---|
| --#line 848 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 877 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - do { INT_TYPE ret_=(knuth_lfib_get(THIS->ctx)); push_int(ret_); return; }while(0); |
|---|
| --#line 850 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 879 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - } |
|---|
| - |
|---|
| - } |
|---|
| --#line 852 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 881 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - /* Get a pseudorandom string of length @[len]. |
|---|
| - */ |
|---|
| - #define f_LFib_get_string_defined |
|---|
| - DEFAULT_CMOD_STORAGE ptrdiff_t f_LFib_get_string_fun_num = 0; |
|---|
| - DEFAULT_CMOD_STORAGE void f_LFib_get_string(INT32 args) { |
|---|
| --#line 854 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 883 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - INT_TYPE len; |
|---|
| --#line 854 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 883 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(args != 1) wrong_number_of_args_error("get_string",args,1); |
|---|
| --#line 854 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 883 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - if(Pike_sp[0-1].type != PIKE_T_INT) SIMPLE_ARG_TYPE_ERROR("get_string",1,"int"); |
|---|
| --#line 854 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 883 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - len=Pike_sp[0-1].u.integer; |
|---|
| --#line 854 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 883 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - { |
|---|
| - struct pike_string *s = begin_shared_string(len); |
|---|
| - knuth_lfib_random(THIS->ctx, len, s->str); |
|---|
| -@@ -1491,7 +1527,7 @@ |
|---|
| - } |
|---|
| - |
|---|
| - #endif /* LFib_event_handler_defined */ |
|---|
| --#line 861 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 890 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - /* @endclass |
|---|
| - */ |
|---|
| - |
|---|
| -@@ -1514,10 +1550,10 @@ |
|---|
| - #ifdef class_Yarrow_defined |
|---|
| - |
|---|
| - #ifdef PROG_YARROW_ID |
|---|
| --#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - START_NEW_PROGRAM_ID(YARROW); |
|---|
| - #else |
|---|
| --#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - start_new_program(); |
|---|
| - |
|---|
| - #endif /* PROG_YARROW_ID */ |
|---|
| -@@ -1533,6 +1569,11 @@ |
|---|
| - Yarrow_storage_offset = ADD_STORAGE(struct Yarrow_struct); |
|---|
| - #endif /* THIS_YARROW */ |
|---|
| - |
|---|
| -+#ifdef var_seed_file_Yarrow_defined |
|---|
| -+ PIKE_MAP_VARIABLE("seed_file", Yarrow_storage_offset + OFFSETOF(Yarrow_struct, seed_file), |
|---|
| -+ tString, PIKE_T_STRING, ID_PRIVATE|ID_STATIC); |
|---|
| -+#endif /* var_seed_file_Yarrow_defined */ |
|---|
| -+ |
|---|
| - #ifdef Yarrow_event_handler_defined |
|---|
| - pike_set_prog_event_callback(Yarrow_event_handler); |
|---|
| - |
|---|
| -@@ -1545,69 +1586,69 @@ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_create_defined |
|---|
| - f_Yarrow_create_fun_num = |
|---|
| --#line 56 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 71 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("create", f_Yarrow_create, tFunc(tOr(tVoid,"\10\200\0\0\0\177\377\377\377"),tVoid), ID_PROTECTED, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_create_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_seed_defined |
|---|
| - f_Yarrow_seed_fun_num = |
|---|
| --#line 89 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 104 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("seed", f_Yarrow_seed, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_seed_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_min_seed_size_defined |
|---|
| - f_Yarrow_min_seed_size_fun_num = |
|---|
| --#line 106 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 123 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("min_seed_size", f_Yarrow_min_seed_size, tFunc(tNone,"\10\0\0\0\0\177\377\377\377"), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_min_seed_size_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_get_seed_defined |
|---|
| - f_Yarrow_get_seed_fun_num = |
|---|
| --#line 118 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -- ADD_FUNCTION2("get_seed", f_Yarrow_get_seed, tFunc(tNone,tString), 0, OPT_EXTERNAL_DEPEND); |
|---|
| -+#line 136 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+ ADD_FUNCTION2("get_seed", f_Yarrow_get_seed, tDeprecated(tFunc(tNone, tStr8)), 0, OPT_EXTERNAL_DEPEND); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_get_seed_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_is_seeded_defined |
|---|
| - f_Yarrow_is_seeded_fun_num = |
|---|
| --#line 133 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 157 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("is_seeded", f_Yarrow_is_seeded, tFunc(tNone,"\10\0\0\0\0\0\0\0\1"), 0, OPT_EXTERNAL_DEPEND); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_is_seeded_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_force_reseed_defined |
|---|
| - f_Yarrow_force_reseed_fun_num = |
|---|
| --#line 144 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 168 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("force_reseed", f_Yarrow_force_reseed, tFunc(tNone,tVoid), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_force_reseed_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_update_defined |
|---|
| - f_Yarrow_update_fun_num = |
|---|
| --#line 156 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 181 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("update", f_Yarrow_update, tFunc(tString "\10\200\0\0\0\177\377\377\377" "\10\200\0\0\0\177\377\377\377","\10\0\0\0\0\0\0\0\1"), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_update_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_needed_sources_defined |
|---|
| - f_Yarrow_needed_sources_fun_num = |
|---|
| --#line 177 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 206 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("needed_sources", f_Yarrow_needed_sources, tFunc(tNone,"\10\0\0\0\0\177\377\377\377"), 0, OPT_EXTERNAL_DEPEND); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_needed_sources_defined */ |
|---|
| - |
|---|
| - #ifdef f_Yarrow_random_string_defined |
|---|
| - f_Yarrow_random_string_fun_num = |
|---|
| --#line 186 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 215 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("random_string", f_Yarrow_random_string, tFunc("\10\200\0\0\0\177\377\377\377",tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Yarrow_random_string_defined */ |
|---|
| --#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - Yarrow_program=end_program(); |
|---|
| --#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - Yarrow_program_fun_num=add_program_constant("Yarrow",Yarrow_program,0); |
|---|
| - |
|---|
| - #endif /* class_Yarrow_defined */ |
|---|
| -@@ -1615,10 +1656,10 @@ |
|---|
| - #ifdef class_CBC_defined |
|---|
| - |
|---|
| - #ifdef PROG_CBC_ID |
|---|
| --#line 313 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 342 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - START_NEW_PROGRAM_ID(CBC); |
|---|
| - #else |
|---|
| --#line 313 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 342 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - start_new_program(); |
|---|
| - |
|---|
| - #endif /* PROG_CBC_ID */ |
|---|
| -@@ -1646,62 +1687,62 @@ |
|---|
| - |
|---|
| - #ifdef f_CBC_create_defined |
|---|
| - f_CBC_create_fun_num = |
|---|
| --#line 395 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 424 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("create", f_CBC_create, tFuncV(tOr3(tPrg(tObj),tObj,tFuncV(tNone,tMix,tAny)),tMix,tVoid), ID_PROTECTED, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_CBC_create_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_name_defined |
|---|
| - f_CBC_name_fun_num = |
|---|
| --#line 426 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 455 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("name", f_CBC_name, tFunc(tNone,tString), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_CBC_name_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_block_size_defined |
|---|
| - f_CBC_block_size_fun_num = |
|---|
| --#line 438 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 467 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("block_size", f_CBC_block_size, tFunc(tNone,"\10\200\0\0\0\177\377\377\377"), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_CBC_block_size_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_key_size_defined |
|---|
| - f_CBC_key_size_fun_num = |
|---|
| --#line 447 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 476 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("key_size", f_CBC_key_size, tFunc(tNone,"\10\200\0\0\0\177\377\377\377"), 0, OPT_EXTERNAL_DEPEND); |
|---|
| - |
|---|
| - #endif /* f_CBC_key_size_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_set_encrypt_key_defined |
|---|
| - f_CBC_set_encrypt_key_fun_num = |
|---|
| --#line 457 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 486 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("set_encrypt_key", f_CBC_set_encrypt_key, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_CBC_set_encrypt_key_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_set_decrypt_key_defined |
|---|
| - f_CBC_set_decrypt_key_fun_num = |
|---|
| --#line 471 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 500 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("set_decrypt_key", f_CBC_set_decrypt_key, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_CBC_set_decrypt_key_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_set_iv_defined |
|---|
| - f_CBC_set_iv_fun_num = |
|---|
| --#line 484 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 513 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("set_iv", f_CBC_set_iv, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_CBC_set_iv_defined */ |
|---|
| - |
|---|
| - #ifdef f_CBC_crypt_defined |
|---|
| - f_CBC_crypt_fun_num = |
|---|
| --#line 499 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 528 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("crypt", f_CBC_crypt, tFunc(tString,tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_CBC_crypt_defined */ |
|---|
| --#line 313 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 342 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - CBC_program=end_program(); |
|---|
| --#line 313 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 342 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - CBC_program_fun_num=add_program_constant("CBC",CBC_program,0); |
|---|
| - |
|---|
| - #endif /* class_CBC_defined */ |
|---|
| -@@ -1709,10 +1750,10 @@ |
|---|
| - #ifdef class_Proxy_defined |
|---|
| - |
|---|
| - #ifdef PROG_PROXY_ID |
|---|
| --#line 539 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 568 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - START_NEW_PROGRAM_ID(PROXY); |
|---|
| - #else |
|---|
| --#line 539 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 568 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - start_new_program(); |
|---|
| - |
|---|
| - #endif /* PROG_PROXY_ID */ |
|---|
| -@@ -1740,69 +1781,69 @@ |
|---|
| - |
|---|
| - #ifdef f_Proxy_create_defined |
|---|
| - f_Proxy_create_fun_num = |
|---|
| --#line 571 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 600 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("create", f_Proxy_create, tFuncV(tOr3(tPrg(tObj),tObj,tFuncV(tNone,tMix,tAny)),tMix,tVoid), ID_PROTECTED, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_create_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_name_defined |
|---|
| - f_Proxy_name_fun_num = |
|---|
| --#line 596 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 625 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("name", f_Proxy_name, tFunc(tNone,tString), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_Proxy_name_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_block_size_defined |
|---|
| - f_Proxy_block_size_fun_num = |
|---|
| --#line 609 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 638 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("block_size", f_Proxy_block_size, tFunc(tNone,"\10\200\0\0\0\177\377\377\377"), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_Proxy_block_size_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_key_size_defined |
|---|
| - f_Proxy_key_size_fun_num = |
|---|
| --#line 619 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 648 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("key_size", f_Proxy_key_size, tFunc(tNone,"\10\200\0\0\0\177\377\377\377"), 0, OPT_EXTERNAL_DEPEND); |
|---|
| - |
|---|
| - #endif /* f_Proxy_key_size_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_set_encrypt_key_defined |
|---|
| - f_Proxy_set_encrypt_key_fun_num = |
|---|
| --#line 632 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 661 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("set_encrypt_key", f_Proxy_set_encrypt_key, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_set_encrypt_key_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_set_decrypt_key_defined |
|---|
| - f_Proxy_set_decrypt_key_fun_num = |
|---|
| --#line 649 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 678 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("set_decrypt_key", f_Proxy_set_decrypt_key, tFunc(tString,tObj), 0, OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_set_decrypt_key_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_crypt_defined |
|---|
| - f_Proxy_crypt_fun_num = |
|---|
| --#line 667 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 696 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("crypt", f_Proxy_crypt, tFunc(tString,tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_crypt_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_pad_defined |
|---|
| - f_Proxy_pad_fun_num = |
|---|
| --#line 745 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 774 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("pad", f_Proxy_pad, tFunc(tNone,tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_pad_defined */ |
|---|
| - |
|---|
| - #ifdef f_Proxy_unpad_defined |
|---|
| - f_Proxy_unpad_fun_num = |
|---|
| --#line 772 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 801 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("unpad", f_Proxy_unpad, tFunc(tString,tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_Proxy_unpad_defined */ |
|---|
| --#line 539 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 568 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - Proxy_program=end_program(); |
|---|
| --#line 539 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 568 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - Proxy_program_fun_num=add_program_constant("Proxy",Proxy_program,0); |
|---|
| - |
|---|
| - #endif /* class_Proxy_defined */ |
|---|
| -@@ -1810,10 +1851,10 @@ |
|---|
| - #ifdef class_LFib_defined |
|---|
| - |
|---|
| - #ifdef PROG_LFIB_ID |
|---|
| --#line 813 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 842 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - START_NEW_PROGRAM_ID(LFIB); |
|---|
| - #else |
|---|
| --#line 813 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 842 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - start_new_program(); |
|---|
| - |
|---|
| - #endif /* PROG_LFIB_ID */ |
|---|
| -@@ -1841,21 +1882,21 @@ |
|---|
| - |
|---|
| - #ifdef f_LFib_create_defined |
|---|
| - f_LFib_create_fun_num = |
|---|
| --#line 830 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 859 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("create", f_LFib_create, tFunc("\10\200\0\0\0\177\377\377\377",tVoid), ID_PROTECTED, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_LFib_create_defined */ |
|---|
| - |
|---|
| - #ifdef f_LFib_reseed_defined |
|---|
| - f_LFib_reseed_fun_num = |
|---|
| --#line 841 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 870 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("reseed", f_LFib_reseed, tFunc("\10\200\0\0\0\177\377\377\377",tObj), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_LFib_reseed_defined */ |
|---|
| - |
|---|
| - #ifdef f_LFib_get_defined |
|---|
| - f_LFib_get_fun_num = |
|---|
| --#line 848 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 877 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("get", f_LFib_get, tFunc(tNone,"\10\200\0\0\0\177\377\377\377"), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_LFib_get_defined */ |
|---|
| -@@ -1865,20 +1906,20 @@ |
|---|
| - ADD_FUNCTION2("get_string", f_LFib_get_string, tFunc("\10\200\0\0\0\177\377\377\377",tString), 0, OPT_EXTERNAL_DEPEND|OPT_SIDE_EFFECT); |
|---|
| - |
|---|
| - #endif /* f_LFib_get_string_defined */ |
|---|
| --#line 813 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 842 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - LFib_program=end_program(); |
|---|
| --#line 813 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 842 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - LFib_program_fun_num=add_program_constant("LFib",LFib_program,0); |
|---|
| - |
|---|
| - #endif /* class_LFib_defined */ |
|---|
| - |
|---|
| - #ifdef f_crypt_md5_defined |
|---|
| - f_crypt_md5_fun_num = |
|---|
| --#line 222 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 251 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ADD_FUNCTION2("crypt_md5", f_crypt_md5, tFunc(tString tString,tString), 0, OPT_TRY_OPTIMIZE); |
|---|
| - |
|---|
| - #endif /* f_crypt_md5_defined */ |
|---|
| --#line 879 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 908 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ; |
|---|
| - #ifdef HAVE_LIBNETTLE |
|---|
| - hash_init(); |
|---|
| -@@ -1906,7 +1947,7 @@ |
|---|
| - |
|---|
| - #ifdef class_Yarrow_defined |
|---|
| - if(Yarrow_program) { |
|---|
| --#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 44 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - free_program(Yarrow_program); |
|---|
| - Yarrow_program=0; |
|---|
| - } |
|---|
| -@@ -1915,7 +1956,7 @@ |
|---|
| - |
|---|
| - #ifdef class_CBC_defined |
|---|
| - if(CBC_program) { |
|---|
| --#line 313 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 342 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - free_program(CBC_program); |
|---|
| - CBC_program=0; |
|---|
| - } |
|---|
| -@@ -1924,7 +1965,7 @@ |
|---|
| - |
|---|
| - #ifdef class_Proxy_defined |
|---|
| - if(Proxy_program) { |
|---|
| --#line 539 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 568 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - free_program(Proxy_program); |
|---|
| - Proxy_program=0; |
|---|
| - } |
|---|
| -@@ -1933,13 +1974,13 @@ |
|---|
| - |
|---|
| - #ifdef class_LFib_defined |
|---|
| - if(LFib_program) { |
|---|
| --#line 813 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 842 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - free_program(LFib_program); |
|---|
| - LFib_program=0; |
|---|
| - } |
|---|
| - |
|---|
| - #endif /* class_LFib_defined */ |
|---|
| --#line 903 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| -+#line 932 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/nettle.cmod" |
|---|
| - ; |
|---|
| - } |
|---|
| - |
|---|
| ---- Pike-v7.8.316/src/post_modules/Nettle/cipher.c 2009-05-17 00:54:16.000000000 +0200 |
|---|
| -+++ pike7.8-7.8.316/src/post_modules/Nettle/cipher.c 2009-08-22 23:51:41.000000000 +0200 |
|---|
| -@@ -91,8 +91,8 @@ |
|---|
| - pike_nettle_set_key_func set_encrypt_key; |
|---|
| - pike_nettle_set_key_func set_decrypt_key; |
|---|
| - |
|---|
| -- nettle_crypt_func encrypt; |
|---|
| -- nettle_crypt_func decrypt; |
|---|
| -+ nettle_crypt_func *encrypt; |
|---|
| -+ nettle_crypt_func *decrypt; |
|---|
| - }; |
|---|
| - |
|---|
| - #define _PIKE_CIPHER(name, NAME) { \ |
|---|
| -@@ -102,8 +102,8 @@ |
|---|
| - NAME##_KEY_SIZE, \ |
|---|
| - pike_##name##_set_encrypt_key, \ |
|---|
| - pike_##name##_set_decrypt_key, \ |
|---|
| -- (nettle_crypt_func) name##_encrypt, \ |
|---|
| -- (nettle_crypt_func) name##_decrypt, \ |
|---|
| -+ (nettle_crypt_func*) name##_encrypt, \ |
|---|
| -+ (nettle_crypt_func*) name##_decrypt, \ |
|---|
| - } |
|---|
| - |
|---|
| - /*! @class CipherInfo |
|---|
| -@@ -281,7 +281,7 @@ |
|---|
| - |
|---|
| - #ifdef var_crypt_CipherState_defined |
|---|
| - #line 178 "/home/peter/hack/Pike/7.8-distmaker/7.8/src/post_modules/Nettle/cipher.cmod" |
|---|
| --nettle_crypt_func crypt; |
|---|
| -+nettle_crypt_func *crypt; |
|---|
| - #endif /* var_crypt_CipherState_defined */ |
|---|
| - |
|---|
| - #ifdef var_ctx_CipherState_defined |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/01_master.in.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/01_master.in.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/01_master.in.dpatch (nonexistent) |
|---|
| @@ -1,25 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 01_master.in.dpatch by <magnus@kibibyte.se> |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Add local site-pike directories to master.pike.in |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| -diff -urNad trunk~/lib/master.pike.in trunk/lib/master.pike.in |
|---|
| ---- trunk~/lib/master.pike.in 2007-01-01 01:28:04.000000000 +0100 |
|---|
| -+++ trunk/lib/master.pike.in 2007-10-02 14:04:02.000000000 +0200 |
|---|
| -@@ -2094,6 +2094,14 @@ |
|---|
| - add_module_path("#lib_prefix#/modules"); |
|---|
| - #endif |
|---|
| - |
|---|
| -+ // Debian paths |
|---|
| -+ add_include_path("/usr/local/include/pike"); |
|---|
| -+ add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__); |
|---|
| -+ add_module_path("/usr/local/lib/pike/site_pike"); |
|---|
| -+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike"); |
|---|
| -+ add_module_path("/usr/local/share/pike/site_pike"); |
|---|
| -+ add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike"); |
|---|
| -+ |
|---|
| - #if "#cflags# "[0]!='#' |
|---|
| - cflags = "#cflags#"; |
|---|
| - #endif |
|---|
| /7.8.316-dfsg-1/debian/patches/01_master.in.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/05_install.pike.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/05_install.pike.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/05_install.pike.dpatch (nonexistent) |
|---|
| @@ -1,69 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 05_install.pike.dpatch by <magnus@proffe.kibibyte.se> |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Allow share_prefix to be separately overridden in install.pike |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| -diff -urNad pike7.8-7.8.116~/src/Makefile.in pike7.8-7.8.116/src/Makefile.in |
|---|
| ---- pike7.8-7.8.116~/src/Makefile.in 2008-11-18 15:16:56.000000000 -0400 |
|---|
| -+++ pike7.8-7.8.116/src/Makefile.in 2009-05-04 21:50:17.000000000 -0300 |
|---|
| -@@ -57,7 +57,7 @@ |
|---|
| - # TESTARGS = -F -a |
|---|
| - |
|---|
| - # Arguments for install.pike used by the install targets. |
|---|
| --INSTALLARGS = --new-style |
|---|
| -+INSTALLARGS ?= --new-style |
|---|
| - |
|---|
| - # |
|---|
| - # use bison please, yacc isn't good enough. |
|---|
| -@@ -658,7 +658,7 @@ |
|---|
| - man_prefix="$(man_prefix)" pike_name=$(pike_name) \ |
|---|
| - fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \ |
|---|
| - cflags="@DYNAMIC_MODULE_FLAGS@" ldflags="" \ |
|---|
| -- $(INSTALLARGS) |
|---|
| -+ share_prefix="$(share_prefix)" $(INSTALLARGS) |
|---|
| - |
|---|
| - install_interactive: pike-complete-stamp tools |
|---|
| - @$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \ |
|---|
| ---- a/bin/install.pike 2009-06-08 23:51:36.000000000 +0200 |
|---|
| -+++ b/bin/install.pike 2009-08-22 15:46:55.000000000 +0200 |
|---|
| -@@ -1904,6 +1904,7 @@ |
|---|
| - string exec_prefix; |
|---|
| - string lib_prefix; |
|---|
| - string include_prefix; |
|---|
| -+string share_prefix; |
|---|
| - string doc_prefix; |
|---|
| - string man_prefix; |
|---|
| - string cflags; |
|---|
| -@@ -1946,6 +1947,8 @@ |
|---|
| - lib_prefix=vars->lib_prefix||(prefix+"/lib/pike/"); |
|---|
| - include_prefix = |
|---|
| - vars->include_prefix || combine_path(prefix,"include","pike"); |
|---|
| -+ share_prefix = |
|---|
| -+ vars->share_prefix || lib_prefix; |
|---|
| - doc_prefix = |
|---|
| - vars->doc_prefix || combine_path(prefix, "doc", "pike"); |
|---|
| - man_prefix=vars->man_prefix||(prefix+"/share/man/"); |
|---|
| -@@ -2128,7 +2131,7 @@ |
|---|
| - lib_prefix = combine_path(prefix, "lib"); |
|---|
| - include_prefix = combine_path(prefix,"include","pike"); |
|---|
| - make_master("lib/master.pike", "lib/master.pike.in", |
|---|
| -- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags); |
|---|
| -+ lib_prefix, include_prefix, share_prefix, cflags, ldflags); |
|---|
| - status1("Installing master done."); |
|---|
| - return 0; |
|---|
| - |
|---|
| -@@ -2853,10 +2856,10 @@ |
|---|
| - } |
|---|
| - else |
|---|
| - make_master(combine_path(vars->TMP_LIBDIR,"master.pike"), master_src, |
|---|
| -- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags); |
|---|
| -+ lib_prefix, include_prefix, share_prefix, cflags, ldflags); |
|---|
| - |
|---|
| - install_dir(vars->TMP_LIBDIR,lib_prefix,1); |
|---|
| -- install_dir(vars->LIBDIR_SRC,lib_prefix,1); |
|---|
| -+ install_dir(vars->LIBDIR_SRC,share_prefix,1); |
|---|
| - |
|---|
| - install_header_files(vars->SRCDIR,include_prefix); |
|---|
| - install_header_files(combine_path(vars->SRCDIR,"code"), |
|---|
| /7.8.316-dfsg-1/debian/patches/05_install.pike.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch (nonexistent) |
|---|
| @@ -1,18 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 07_dynamic_module_makefile.in-libgcc.dpatch by <magnus@proffe.kibibyte.se> |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Figure out LIBGCC name. |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| -diff -urNad trunk~/src/modules/dynamic_module_makefile.in trunk/src/modules/dynamic_module_makefile.in |
|---|
| ---- trunk~/src/modules/dynamic_module_makefile.in 2008-01-11 01:22:27.000000000 +0100 |
|---|
| -+++ trunk/src/modules/dynamic_module_makefile.in 2009-08-16 21:49:11.000000000 +0200 |
|---|
| -@@ -2,6 +2,7 @@ |
|---|
| - # $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $ |
|---|
| - # |
|---|
| - |
|---|
| -+LIBGCC=$(shell gcc -print-libgcc-file-name) |
|---|
| - LC_REQ=@LC_REQ@ |
|---|
| - |
|---|
| - LINKAGE_CPPFLAGS= |
|---|
| /7.8.316-dfsg-1/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/10_misplaced_MAXPATHLEN.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/10_misplaced_MAXPATHLEN.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/10_misplaced_MAXPATHLEN.dpatch (nonexistent) |
|---|
| @@ -1,31 +0,0 @@ |
|---|
| -#!/bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 10_misplaced_MAXPATHLEN.dpatch by Samuel Thibault <samuel.thibault@ens-lyon.org> |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Move reserve MAXPATHLEN definition up. |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| -diff -urNad pike7.8-7.8.316~/src/modules/files/efuns.c pike7.8-7.8.316/src/modules/files/efuns.c |
|---|
| ---- pike7.8-7.8.316~/src/modules/files/efuns.c 2009-08-15 01:01:23.000000000 +0200 |
|---|
| -+++ pike7.8-7.8.316/src/modules/files/efuns.c 2009-08-15 01:02:21.000000000 +0200 |
|---|
| -@@ -109,6 +109,10 @@ |
|---|
| - |
|---|
| - #endif /* __NT__ */ |
|---|
| - |
|---|
| -+#ifndef MAXPATHLEN |
|---|
| -+#define MAXPATHLEN 32768 |
|---|
| -+#endif |
|---|
| -+ |
|---|
| - struct array *encode_stat(PIKE_STAT_T *s) |
|---|
| - { |
|---|
| - struct array *a; |
|---|
| -@@ -1443,9 +1447,6 @@ |
|---|
| - size*=2; |
|---|
| - } while (size < 10000); |
|---|
| - #else |
|---|
| --#ifndef MAXPATHLEN |
|---|
| --#define MAXPATHLEN 32768 |
|---|
| --#endif |
|---|
| - tmp=xalloc(MAXPATHLEN+1); |
|---|
| - THREADS_ALLOW_UID(); |
|---|
| - e = getwd(tmp); |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/02_smartlink_rpath.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/02_smartlink_rpath.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/02_smartlink_rpath.dpatch (nonexistent) |
|---|
| @@ -1,51 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 02_smartlink_rpath.dpatch |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Make smartlink not use -rpath |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| -diff -urNad trunk~/bin/smartlink trunk/bin/smartlink |
|---|
| ---- trunk~/bin/smartlink 2008-08-19 13:51:08.000000000 +0200 |
|---|
| -+++ trunk/bin/smartlink 2009-08-16 17:18:26.000000000 +0200 |
|---|
| -@@ -162,9 +162,8 @@ |
|---|
| - LDOPTS="$LDOPTS -R$RPATH" |
|---|
| - ;; |
|---|
| - Linux\ 2.*) |
|---|
| -- if test x$LINKING != xno -a "x$RPATH" != x ; then |
|---|
| -- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH" |
|---|
| -- fi |
|---|
| -+ LD_LIBRARY_PATH="$RPATH" |
|---|
| -+ export LD_LIBRARY_PATH |
|---|
| - ;; |
|---|
| - UnixWare\ 7.*) |
|---|
| - if test x$LINKING != xno -a "x$RPATH" != x ; then |
|---|
| -diff -urNad trunk~/src/smartlink.c trunk/src/smartlink.c |
|---|
| ---- trunk~/src/smartlink.c 2008-08-19 17:57:34.000000000 +0200 |
|---|
| -+++ trunk/src/smartlink.c 2009-08-16 17:18:26.000000000 +0200 |
|---|
| -@@ -160,7 +160,7 @@ |
|---|
| - full_rpath = rpath; |
|---|
| - |
|---|
| - #ifdef USE_Wl |
|---|
| -- strcat(rpath, "-Wl,-rpath,"); |
|---|
| -+ /* strcat(rpath, "-Wl,-rpath,"); */ |
|---|
| - #elif defined(USE_Wl_R) |
|---|
| - strcat(rpath, "-Wl,-R"); |
|---|
| - #elif defined(USE_R) |
|---|
| -@@ -310,7 +310,7 @@ |
|---|
| - } |
|---|
| - rpath_in_use |= add_path(rpath, ld_lib_path); |
|---|
| - } |
|---|
| -- |
|---|
| -+#if 0 |
|---|
| - if (rpath_in_use) { |
|---|
| - /* Delete the terminating ':' */ |
|---|
| - rpath[strlen(rpath) - 1] = 0; |
|---|
| -@@ -357,6 +357,7 @@ |
|---|
| - #error Unknown method |
|---|
| - #endif |
|---|
| - } |
|---|
| -+#endif |
|---|
| - |
|---|
| - new_argv[new_argc++] = NULL; |
|---|
| - |
|---|
| /7.8.316-dfsg-1/debian/patches/02_smartlink_rpath.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/11_pthread_stub.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/11_pthread_stub.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/11_pthread_stub.dpatch (nonexistent) |
|---|
| @@ -1,32 +0,0 @@ |
|---|
| -#! /bin/sh |
|---|
| -## 11_pthread_stub.dpatch by Magnus Holmgren <holmgren@debian.org> |
|---|
| -## |
|---|
| -## DP: Add check for stubbiness of pthread_atfork(). |
|---|
| - |
|---|
| -dpatch_patch() { |
|---|
| - perl -pi - src/configure <<'END_PERL' |
|---|
| -$already_patched = 1 if (/^\Q#if defined(__stub_pthread_atfork)\E/); |
|---|
| -if (/\Qpthread_atfork(0,0,0)\E/ && !$already_patched) { |
|---|
| - $found = 1; print <<'EOT'; |
|---|
| -#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork) |
|---|
| -#error pthread_atfork is just a stub |
|---|
| -#endif |
|---|
| -EOT |
|---|
| -} |
|---|
| -END { exit !$found } |
|---|
| -END_PERL |
|---|
| -} |
|---|
| - |
|---|
| -dpatch_unpatch() { |
|---|
| - perl -pi - src/configure <<'END_PERL' |
|---|
| -if (/\Q#if defined(__stub_pthread_atfork)\E/ .. /#endif/) { |
|---|
| - $found = 1; $_ = ''; |
|---|
| -} |
|---|
| -END { exit !$found } |
|---|
| -END_PERL |
|---|
| -} |
|---|
| - |
|---|
| - |
|---|
| -DPATCH_LIB_NO_DEFAULT=1 |
|---|
| - |
|---|
| -. /usr/share/dpatch/dpatch.lib.sh |
|---|
| /7.8.316-dfsg-1/debian/patches/11_pthread_stub.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/04_make_variables_fpic.dpatch |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/04_make_variables_fpic.dpatch (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/04_make_variables_fpic.dpatch (nonexistent) |
|---|
| @@ -1,21 +0,0 @@ |
|---|
| -#! /bin/sh /usr/share/dpatch/dpatch-run |
|---|
| -## 04_make_variables_fpic.dpatch by <magnus@proffe.kibibyte.se> |
|---|
| -## |
|---|
| -## All lines beginning with `## DP:' are a description of the patch. |
|---|
| -## DP: Add -fPIC to OTHERFLAGS and NOOPTFLAGS in src/make_variables.in |
|---|
| - |
|---|
| -@DPATCH@ |
|---|
| - |
|---|
| ---- pike7.6-7.6.27/src/make_variables.in 2004-04-23 17:41:33.000000000 +0200 |
|---|
| -+++ pike7.6-7.6.27.new/src/make_variables.in 2005-06-18 04:19:00.278899432 +0200 |
|---|
| -@@ -26,8 +26,8 @@ RUNPIKE=$(@RUNPIKE@) |
|---|
| - OPTIMIZE=@OPTIMIZE@ |
|---|
| - INSTALL=@INSTALL@ |
|---|
| - WARN=@WARN@ |
|---|
| --OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL) |
|---|
| --NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL) |
|---|
| -+OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL) -fPIC |
|---|
| -+NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL) -fPIC |
|---|
| - AR=@AR@ |
|---|
| - SRCDIR=@srcdir@ |
|---|
| - PMOD_TARGETS=@PMOD_TARGETS@ |
|---|
| /7.8.316-dfsg-1/debian/patches/04_make_variables_fpic.dpatch |
|---|
| Property changes: |
|---|
| Deleted: svn:executable |
|---|
| ## -1 +0,0 ## |
|---|
| -* |
|---|
| \ No newline at end of property |
|---|
| Index: 7.8.316-dfsg-1/debian/patches/00list |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/patches/00list (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/patches/00list (nonexistent) |
|---|
| @@ -1,8 +0,0 @@ |
|---|
| -01_master.in |
|---|
| -02_smartlink_rpath |
|---|
| -#04_make_variables_fpic |
|---|
| -#05_install.pike |
|---|
| -07_dynamic_module_makefile.in-libgcc |
|---|
| -10_misplaced_MAXPATHLEN |
|---|
| -11_pthread_stub |
|---|
| -nettle_2.0 |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-svg.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-svg.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-svg.install (nonexistent) |
|---|
| @@ -1 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*Image_SVG.so |
|---|
| Index: 7.8.316-dfsg-1/debian/docs |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/docs (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/docs (nonexistent) |
|---|
| @@ -1,3 +0,0 @@ |
|---|
| -README-CVS |
|---|
| -README |
|---|
| -COMMITTERS |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-sqlite.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-sqlite.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-sqlite.install (nonexistent) |
|---|
| @@ -1,3 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*SQLite.* |
|---|
| -usr/lib/pike/*/modules/Sql.pmod/sqlite* |
|---|
| -#usr/share/pike/*/modules/Sql.pmod/sqlite* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-gl.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-gl.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-gl.install (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*GL* |
|---|
| -#usr/share/pike/*/modules/*GL* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike.xpm |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike.xpm (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike.xpm (nonexistent) |
|---|
| @@ -1,38 +0,0 @@ |
|---|
| -/* XPM */ |
|---|
| -static char * pike_xpm[] = { |
|---|
| -"32 32 3 1", |
|---|
| -" c None", |
|---|
| -". c #000000", |
|---|
| -"+ c #FFFFFF", |
|---|
| -" .......................... ", |
|---|
| -" .++++++++++++++++++++++++. ", |
|---|
| -" .+++.....+..+..+..+.....+. ", |
|---|
| -" .+++.....+..+.....+.....+. ", |
|---|
| -" .+++..+..........+...++++. ", |
|---|
| -" .++........+....++.....++. ", |
|---|
| -" .++.....+..+....++.....++. ", |
|---|
| -" .++..+++........+...+++++. ", |
|---|
| -" .+...+++..+..+.........++. ", |
|---|
| -" .+..++++..+..+........+++. ", |
|---|
| -" .++++++++++++++++++++++++. ", |
|---|
| -" .+++++++++++++++++++++++.... ", |
|---|
| -" .+++++..++++++++...++....... ", |
|---|
| -" .++++.....+++++...........+. ", |
|---|
| -" .+++................++..++.. ", |
|---|
| -" .+++.....+.........++..++.. ", |
|---|
| -" .++++........++..+++..++.. ", |
|---|
| -" .++++++......++++++..++... ", |
|---|
| -" .++++......+++++++..+++... ", |
|---|
| -" .+++.....++..+++++...+++.... ", |
|---|
| -" .++.....++..++++++++...++.+. ", |
|---|
| -" .+....++++.++++++++++....... ", |
|---|
| -" ....++..+..+++..+........... ", |
|---|
| -" ....+..+.......++++..++++. ", |
|---|
| -"......+....+...++++++++++++. ", |
|---|
| -".+...+.....++++++++++++++++. ", |
|---|
| -"...++......++++++++++++++++. ", |
|---|
| -" ..++.....+++++++++++++++++. ", |
|---|
| -" .++++++++++++++++++++++++. ", |
|---|
| -" .......................... ", |
|---|
| -" ", |
|---|
| -" "}; |
|---|
| Index: 7.8.316-dfsg-1/debian/README.source |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/README.source (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/README.source (nonexistent) |
|---|
| @@ -1,8 +0,0 @@ |
|---|
| -This package uses dpatch to manage all modifications to the upstream |
|---|
| -source. Changes are stored in the source package as diffs in |
|---|
| -debian/patches and applied during the build. For basic usage |
|---|
| -information, see |
|---|
| - |
|---|
| - /usr/share/doc/dpatch/README.source.gz |
|---|
| - |
|---|
| -(after installing dpatch). |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-core.postinst |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-core.postinst (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-core.postinst (nonexistent) |
|---|
| @@ -1,62 +0,0 @@ |
|---|
| -#! /bin/sh |
|---|
| -# postinst script for pike7.8 |
|---|
| -# |
|---|
| -# see: dh_installdeb(1) |
|---|
| -# |
|---|
| -# $Id: pike7.8-core.postinst,v 1.1 2006/01/17 22:37:48 grendel Exp $ |
|---|
| -# |
|---|
| - |
|---|
| -set -e |
|---|
| - |
|---|
| -PIKE=7.8 |
|---|
| -PIKEBIN=pike${PIKE} |
|---|
| - |
|---|
| -# summary of how this script can be called: |
|---|
| -# * <postinst> `configure' <most-recently-configured-version> |
|---|
| -# * <old-postinst> `abort-upgrade' <new version> |
|---|
| -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> |
|---|
| -# <new-version> |
|---|
| -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' |
|---|
| -# <failed-install-package> <version> `removing' |
|---|
| -# <conflicting-package> <version> |
|---|
| -# for details, see http://www.debian.org/doc/debian-policy/ or |
|---|
| -# the debian-policy package |
|---|
| -# |
|---|
| -# quoting from the policy: |
|---|
| -# Any necessary prompting should almost always be confined to the |
|---|
| -# post-installation script, and should be protected with a conditional |
|---|
| -# so that unnecessary prompting doesn't happen if a package's |
|---|
| -# installation fails and the `postinst' is called with `abort-upgrade', |
|---|
| -# `abort-remove' or `abort-deconfigure'. |
|---|
| -LOCAL_DIRS="share/pike/site_pike share/pike${PIKE}/site_pike lib/pike/site_pike lib/pike${PIKE}/site_pike include/pike include/pike${PIKE}" |
|---|
| - |
|---|
| -case "$1" in |
|---|
| - configure) |
|---|
| - update-alternatives --install /usr/bin/pike pike /usr/bin/${PIKEBIN} 12 \ |
|---|
| - --slave /usr/share/man/man1/pike.1.gz pike.1.gz /usr/share/man/man1/${PIKEBIN}.1.gz |
|---|
| - # |
|---|
| - # If the creation fails, so be it, user might have the filesystem mounted r/o |
|---|
| - # |
|---|
| - for d in $LOCAL_DIRS; do |
|---|
| - if [ ! -d /usr/local/$d ]; then |
|---|
| - install -d -m 755 -o root -g root /usr/local/$d || true |
|---|
| - fi |
|---|
| - done |
|---|
| - ;; |
|---|
| - |
|---|
| - abort-upgrade|abort-remove|abort-deconfigure) |
|---|
| - |
|---|
| - ;; |
|---|
| - |
|---|
| - *) |
|---|
| - echo "postinst called with unknown argument \`$1'" >&2 |
|---|
| - exit 1 |
|---|
| - ;; |
|---|
| -esac |
|---|
| - |
|---|
| -# dh_installdeb will replace this with shell code automatically |
|---|
| -# generated by other debhelper scripts. |
|---|
| - |
|---|
| -#DEBHELPER# |
|---|
| - |
|---|
| -exit 0 |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-odbc.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-odbc.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-odbc.install (nonexistent) |
|---|
| @@ -1,4 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*Odbc.* |
|---|
| -#usr/share/pike/*/modules/*Odbc.* |
|---|
| -usr/lib/pike/*/modules/Sql.pmod/odbc* |
|---|
| -#usr/share/pike/*/modules/Sql.pmod/odbc* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-core.prerm |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-core.prerm (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-core.prerm (nonexistent) |
|---|
| @@ -1,44 +0,0 @@ |
|---|
| -#! /bin/sh |
|---|
| -# prerm script for pike7.8 |
|---|
| -# |
|---|
| -# see: dh_installdeb(1) |
|---|
| -# |
|---|
| -# $Id: pike7.8-core.prerm,v 1.1 2006/01/17 22:37:48 grendel Exp $ |
|---|
| -# |
|---|
| - |
|---|
| -set -e |
|---|
| - |
|---|
| -PIKE=7.8 |
|---|
| -PIKEBIN=pike${PIKE} |
|---|
| - |
|---|
| -# summary of how this script can be called: |
|---|
| -# * <prerm> `remove' |
|---|
| -# * <old-prerm> `upgrade' <new-version> |
|---|
| -# * <new-prerm> `failed-upgrade' <old-version> |
|---|
| -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> |
|---|
| -# * <deconfigured's-prerm> `deconfigure' `in-favour' |
|---|
| -# <package-being-installed> <version> `removing' |
|---|
| -# <conflicting-package> <version> |
|---|
| -# for details, see http://www.debian.org/doc/debian-policy/ or |
|---|
| -# the debian-policy package |
|---|
| - |
|---|
| -case "$1" in |
|---|
| - remove|upgrade|deconfigure) |
|---|
| - update-alternatives --remove pike /usr/bin/${PIKEBIN} |
|---|
| - ;; |
|---|
| - failed-upgrade) |
|---|
| - ;; |
|---|
| - *) |
|---|
| - echo "prerm called with unknown argument \`$1'" >&2 |
|---|
| - exit 1 |
|---|
| - ;; |
|---|
| -esac |
|---|
| - |
|---|
| -# dh_installdeb will replace this with shell code automatically |
|---|
| -# generated by other debhelper scripts. |
|---|
| - |
|---|
| -#DEBHELPER# |
|---|
| - |
|---|
| -exit 0 |
|---|
| - |
|---|
| - |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-gdbm.install |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-gdbm.install (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-gdbm.install (nonexistent) |
|---|
| @@ -1,2 +0,0 @@ |
|---|
| -usr/lib/pike/*/modules/*Gdbm.* |
|---|
| -#usr/share/pike/*/modules/*Gdbm.* |
|---|
| Index: 7.8.316-dfsg-1/debian/pike7.8-dev.dirs |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/pike7.8-dev.dirs (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/pike7.8-dev.dirs (nonexistent) |
|---|
| @@ -1,3 +0,0 @@ |
|---|
| -usr/share/emacs/ |
|---|
| -usr/bin/ |
|---|
| -usr/include/pike/ |
|---|
| Index: 7.8.316-dfsg-1/debian/menu |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian/menu (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian/menu (nonexistent) |
|---|
| @@ -1,4 +0,0 @@ |
|---|
| -?package(pike7.8-core):needs="text" section="Applications/Programming"\ |
|---|
| - title="Pike 7.8 HILFE" \ |
|---|
| - command="/usr/bin/pike7.8" \ |
|---|
| - icon="/usr/share/pixmaps/pike7.8.xpm" |
|---|
| Index: 7.8.316-dfsg-1/debian |
|---|
| =================================================================== |
|---|
| --- 7.8.316-dfsg-1/debian (revision 80) |
|---|
| +++ 7.8.316-dfsg-1/debian (nonexistent) |
|---|
| /7.8.316-dfsg-1/debian |
|---|
| Property changes: |
|---|
| Deleted: mergeWithUpstream |
|---|
| ## -1 +0,0 ## |
|---|
| -1 |
|---|
| \ No newline at end of property |
|---|