From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH 1/2] gnu: Add perl-net-psyc. Date: Wed, 21 Sep 2016 18:46:31 +0000 Message-ID: <87shstccqg.fsf@we.make.ritual.n0.is> References: <20160913113237.17434-1-ng0@we.make.ritual.n0.is> <20160913191644.GC5986@jasmine> <87twdjmw4y.fsf@we.make.ritual.n0.is> <87twdj8qqg.fsf@we.make.ritual.n0.is> <878tulr4qk.fsf@we.make.ritual.n0.is> <8737ktr17c.fsf@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmmXd-0000qA-9I for guix-devel@gnu.org; Wed, 21 Sep 2016 14:46:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmmXZ-0002d9-5g for guix-devel@gnu.org; Wed, 21 Sep 2016 14:46:45 -0400 Received: from aibo.runbox.com ([91.220.196.211]:43810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmmXY-0002cl-MU for guix-devel@gnu.org; Wed, 21 Sep 2016 14:46:41 -0400 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1bmmXW-00078z-Jn for guix-devel@gnu.org; Wed, 21 Sep 2016 20:46:38 +0200 Received: from xd9bb8cb8.dyn.telefonica.de ([217.187.140.184] helo=localhost) by mailfront10.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1bmmXQ-00078e-DO for guix-devel@gnu.org; Wed, 21 Sep 2016 20:46:32 +0200 In-Reply-To: <8737ktr17c.fsf@we.make.ritual.n0.is> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Patch on top of this, containing psyclpc. The psyced package which follows as the last one after all of this needs some minor adjustments and then I need to write a service (and/or guile bindings. Hopefully a service is enough.). --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-psyclpc.patch Content-Transfer-Encoding: quoted-printable From=2074a6c1e552a6ae8f438e91cbe318882401b440f8 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 21 Sep 2016 18:08:42 +0000 Subject: [PATCH 1/2] gnu: Add psyclpc. * gnu/packages/psyc.scm (psyclpc): New variable. =2D-- gnu/packages/psyc.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm index 58ce3c6..5a6f1db 100644 =2D-- a/gnu/packages/psyc.scm +++ b/gnu/packages/psyc.scm @@ -24,9 +24,16 @@ #:use-module (guix build-system perl) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (gnu packages web)) =20 ;; The URL at sdf.org is a mirror, officially known. The host www.psyced.o= rg @@ -151,3 +158,68 @@ PSYC, useful for all kinds of clients and servers incl= uding psyced.") (license (list license:agpl3+ ;; test/test.c is based on a public-domain test license:public-domain)))) + +(define-public psyclpc + (package + (name "psyclpc") + (version "20160821") + (source (origin + (method url-fetch) + (uri (list (string-append "http://www.psyced.org/files/" + name "-" version ".tar.xz") + (string-append "http://krosos.sdf.org/static/unix= /" + "perlpsyc-" version ".zip"))) + (sha256 + (base32 + "0c2afcj8b2yr2vmy9sy0528iqs9sw01j6q35lvxicm42gs7vnik2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests/checks. + #:configure-flags (list + "--enable-use-tls=3Dyes" + "--enable-use-mccp" + (string-append "--with-openssl=3D" + (assoc-ref %build-inputs "openssl= ")) + (string-append "--prefix=3D" + (assoc-ref %outputs "out")) + (string-append "--libdir=3D" ; "-DMUD_LIB=3D" + (assoc-ref %outputs "out") + "/opt/psyced/world") + (string-append "--bindir=3D" + (assoc-ref %outputs "out") + "/opt/psyced/bin") + (string-append "--libexecdir=3D" ; "-DERQ_DIR=3D" + (assoc-ref %outputs "out") + "/opt/psyced/run")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir-to-src + (lambda _ + (chdir "src") + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")))) + (replace 'install + (lambda _ + (zero? (system* "make" "install-all"))))))) + (inputs + `(("zlib" ,zlib) + ("openssl" ,openssl))) + ;; pcre is bundled to ensure the version is compatible. XXX: look into + ;; unbundling it. Upstream should update from pcre 4.5 to 8.38. For + ;; functionality reasons we can not unbundle it now. + ;; ("pcre" ,pcre))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("bison" ,bison) + ("gnu-gettext" ,gnu-gettext) + ("help2man" ,help2man) + ("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "http://lpc.psyc.eu/") + (synopsis "psycLPC is a multi-user network server programming language= ") + (description + "LPC is a bytecode language, invented to specifically implement +multi user virtual environments on the internet. This technology is used = for +MUDs and also the psyced implementation of the Protocol for SYnchronous Co= nferencing (PSYC). psycLPC is a fork of LDMud with some new features and +many bug fixes.") + (license license:gpl2))) =2D-=20 2.10.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ng0 writes: > [ Unknown signature status ] > >> I will resend this patch with the fail-safe mirror I just added on >> sdf.org. This is okay with the others in group and very much welcomed. >> The shasum file is signed by my rsa opengpg key which is also used by >> some releases of Gnurl. > > Where the group means other developers hacking around psyced.org, > secushare.org etc. > I also changed my email address, which will make its way into .mailmap > in a commit which happened in the "tinycm" patch series I am working > on. > > From 33d8584709a74e20924743b2606158cacd5ed0c6 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Tue, 13 Sep 2016 10:20:31 +0000 > Subject: [PATCH 1/2] gnu: Add perl-net-psyc. > > * gnu/packages/psyc.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/psyc.scm | 111 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 2 files changed, 112 insertions(+) > create mode 100644 gnu/packages/psyc.scm > > diff --git a/gnu/local.mk b/gnu/local.mk > index e2cf40d..2957e16 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -293,6 +293,7 @@ GNU_SYSTEM_MODULES =3D \ > %D%/packages/pumpio.scm \ > %D%/packages/pretty-print.scm \ > %D%/packages/protobuf.scm \ > + %D%/packages/psyc.scm \ > %D%/packages/pv.scm \ > %D%/packages/python.scm \ > %D%/packages/qemu.scm \ > diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm > new file mode 100644 > index 0000000..dd8a3eb > --- /dev/null > +++ b/gnu/packages/psyc.scm > @@ -0,0 +1,111 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2016 ng0 > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see . > + > +(define-module (gnu packages psyc) > + #:use-module (guix download) > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (guix packages) > + #:use-module (guix build-system perl) > + #:use-module (gnu packages) > + #:use-module (gnu packages ncurses) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages web)) > + > +;; The URL at sdf.org is a mirror, officially known. The host www.psyced= .org > +;; is running on is sometimes (rarely) attacked and this ensure that the= files > +;; are available. > +(define-public perl-net-psyc > + (package > + (name "perl-net-psyc") > + (version "1.1") > + (source > + (origin > + (method url-fetch) > + (uri (list > + (string-append "http://perl.psyc.eu/" > + "perlpsyc-" version ".zip") > + (string-append "http://krosos.sdf.org/static/unix/" > + "perlpsyc-" version ".zip"))) > + (file-name (string-append name "-" version ".zip")) > + (sha256 > + (base32 > + "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42")) > + ;; psycmp3 currently depends on MP3::List and rxaudio (shareware), > + ;; we can add it back when this is no longer the case. > + (snippet '(delete-file "contrib/psycmp3")))) > + (build-system perl-build-system) > + (inputs > + `(("perl-curses" ,perl-curses) > + ("perl-io-socket-ssl" ,perl-io-socket-ssl))) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (delete 'configure) ; No configure script > + ;; There is a Makefile, but it does not install everything > + ;; (leaves out psycion) and says > + ;; "# Just to give you a rough idea". XXX: Fix it upstream. > + (replace 'build > + (lambda _ > + (zero? (system* "make" "manuals")))) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (doc (string-append out "/share/doc/perl-net-psyc")) > + (man1 (string-append out "/share/man/man1")) > + (man3 (string-append out "/share/man/man3")) > + (bin (string-append out "/bin")) > + (libpsyc (string-append out "/lib/psyc/ion")) > + (libperl (string-append out "/lib/perl5/site_perl/" > + ,(package-version perl)))) > + > + (copy-recursively "lib/perl5" libperl) > + (copy-recursively "lib/psycion" libpsyc) > + (copy-recursively "bin" bin) > + (install-file "cgi/psycpager" (string-append doc "/cgi")) > + (copy-recursively "contrib" (string-append doc "/contrib"= )) > + (copy-recursively "hooks" (string-append doc "/hooks")) > + (copy-recursively "sdj" (string-append doc "/sdj")) > + (install-file "README.txt" doc) > + (install-file "TODO.txt" doc) > + (copy-recursively "share/man/man1" man1) > + (copy-recursively "share/man/man3" man3) > + #t))) > + (add-after 'install 'wrap-programs > + (lambda* (#:key outputs #:allow-other-keys) > + ;; Make sure all executables in "bin" find the Perl modules > + ;; provided by this package at runtime. > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin/")) > + (path (getenv "PERL5LIB"))) > + (for-each (lambda (file) > + (wrap-program file > + `("PERL5LIB" ":" prefix (,path)))) > + (find-files bin "\\.*$")) > + #t)))))) > + (description > + "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Se= lect} and > +Gtk2 event loops. This package includes 12 applications and additional = scripts: > +psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a con= trol console > +for @uref{https://torproject.org,tor} router) and many more.") > + (synopsis "Perl implementation of PSYC protocol") > + (home-page "http://perlpsyc.pages.de") > + (license (list license:gpl2 (package-license perl) > + ;; contrib/irssi-psyc.pl: > + license:public-domain > + ;; bin/psycplay states AGPL with no version: > + license:agpl3+)))) > --=20 > 2.10.0 > > From 3b20fd89b6f6e6d1fe00b89bcb1a8ec80853157e Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Tue, 13 Sep 2016 10:57:12 +0000 > Subject: [PATCH 2/2] gnu: Add libpsyc. > > * gnu/packages/psyc.scm (libpsyc): New variable. > --- > gnu/packages/psyc.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm > index dd8a3eb..58ce3c6 100644 > --- a/gnu/packages/psyc.scm > +++ b/gnu/packages/psyc.scm > @@ -20,8 +20,11 @@ > #:use-module (guix download) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > + #:use-module (guix build-system gnu) > #:use-module (guix build-system perl) > #:use-module (gnu packages) > + #:use-module (gnu packages admin) > + #:use-module (gnu packages linux) > #:use-module (gnu packages ncurses) > #:use-module (gnu packages perl) > #:use-module (gnu packages web)) > @@ -109,3 +112,42 @@ for @uref{https://torproject.org,tor} router) and ma= ny more.") > license:public-domain > ;; bin/psycplay states AGPL with no version: > license:agpl3+)))) > + > +(define-public libpsyc > + (package > + (name "libpsyc") > + (version "20160913") > + (source (origin > + (method url-fetch) > + (uri (list > + (string-append "http://www.psyced.org/files/" > + name "-" version ".tar.xz") > + (string-append "http://krosos.sdf.org/static/unix/" > + "perlpsyc-" version ".zip"))) > + (sha256 > + (base32 > + "14q89fxap05ajkfn20rnhc6b1h4i3i2adyr7y6hs5zqwb2lcmc1p"))= )) > + (build-system gnu-build-system) > + (native-inputs > + `(("perl" ,perl) > + ("netcat" ,netcat) > + ("procps" ,procps))) > + (arguments > + `(#:make-flags > + (list "CC=3Dgcc" > + (string-append "PREFIX=3D" (assoc-ref %outputs "out"))) > + #:phases > + (modify-phases %standard-phases > + ;; The rust bindings are the only ones in use, the lpc bindings > + ;; are in psyclpc. The other bindings are not used by anything, > + ;; the chances are high that the bindings do not even work, > + ;; therefore we do not include them. > + ;; TODO: Get a cargo build system. > + (delete 'configure)))) ; no configure script > + (home-page "http://about.psyc.eu/libpsyc") > + (description "libpsyc is a PSYC library in C which implements core a= spects of > +PSYC, useful for all kinds of clients and servers including psyced.") > + (synopsis "PSYC library in C useful for all kinds of clients and ser= vers") > + (license (list license:agpl3+ > + ;; test/test.c is based on a public-domain test > + license:public-domain)))) > --=20 > 2.10.0 > > > --=20 > ng0 =2D-=20 ng0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJX4tWHAAoJEAKilhUMIBgji9oQAI5faJa5JqhwmGcaENZbh7PQ JUbQUOE2+07ywpFynkV7DM9Sj7DY8nXLfuQ5VTRK8WoT2hLOd2wifr04HakLUJfr 2UzS07eivg5pqP7blYfYJTtee9f8qG5tPZUpoWna4ud5Ezy1YnDHFV5UJQH4i2+N a/whvGeLeHXg+272QiWjOp0aysaikvhQglWTnGTNly40/aJGZMFuKDvOeRKncMzP s+Nxpw36d0CvVVNAQebdHv+nA3A8ojGzDrQw3TV3vql0F0smfQ/6Sd4IX60wmoSD oql0Nr4DadGBQKl4s9jmHD9e2hAtGPf29Ugqv+CEI0Sqefh+92EJYns43UM6CEsu 8ivXVYSajxMqowF+PyB3ot3OjlBhXydVNGrpQgzQ0vXSV0c0hwarD1gHY/xtTqIe zWOZj4UukEhkThANkehY+lOr1nilcb12oZW2PuEqd5XkQKH0fboe3kRrtFgbI915 KwBxnTVJCS2ZtqCcTL6Pqqc3WFUbL2pgZHl7YhXE7kPd82FnuJzB3DDeB9+wcHek yfV6i6TU5ZHgOKFDNp4lEZptlV5aNOWcb2uyS1atwrEBfSsZBFs69cH2I+zqmSb5 qfmP2GNPfarRlEHz8GiG19+qPFz8CccUhSS+v/1HY6DS5ndFgD+2xBOwPkVqDVJO C0HvM6r8nkqpNM1g9rGB =pJJR -----END PGP SIGNATURE----- --==-=-=--