x2go-commits March 2013

x2go-commits@lists.x2go.org

2 participants
1021 discussions

page added: wiki:advanced:x2gobroker:plaintexprotocol
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 18:29 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: --- New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2gobroker:plaintexprotocol Edit Summary: created User : sunweaver ====== X2Go Session Broker Protocol: Plain Text ====== //Client implementations: X2Go Client (since 3.x.y.z), Python X2Go (planned for 0.6.x.y)// The X2Go project offers a [[http://code.x2go.org/gitweb?p=x2gobroker.git;a=summary|public X2Go Session Broker implementation]]. However, there also exist several other implementations in large-scale production deployments. In theory, you can implement your own X2Go Session Broker by meeting some basic demands. This documentation explains a minimal broker implementation along the code of a Perl script. In this example, the X2Go Session Broker consists of two components: - ''x2gobroker.pm'' (a Perl module, the broker backend) - the broker frontend (either of the below): - ''x2gobroker.cgi'' (a CGI script written in Perl -> HTTP based broker) - ''x2gobroker'' (a command line script written in Perl -> SSH based broker) ===== X2Go Session Broker: The Backend ==== The package ''x2gobroker.pm'' can be considered as the broker backend. It has to implement two functions at minimal (names are arbitrary): * listProfiles * selectProfile If you want to use authentication with your session broker, the broker backend also has to provide a function called * checkAccess A very small and simple broker backend can look like this: <code> package x2gobroker; use strict; use base 'Exporter'; our @EXPORT = ('checkAccess', 'listSessions', 'selectSession'); #we have two sessions sub selectSession { my ($user, $sid)=@_; if($sid eq "123456789") { print "SERVER:x2goserver.org:22\n"; } if($sid eq "abcdefg") { print "SERVER:x2gotest.org:22\n"; } } #do not check authentication data, #return true on any #combination of username/password sub checkAccess { return 1; } #configuration for two sessions sub listSessions { my $user=shift; print "START_USER_SESSIONS [123456789] name=X2Go Session command=KDE host=x2goserver.org user=$user [abcdefg] name= Test X2Go Session 2 command=startxfce4 host=x2gotest.org user=test END_USER_SESSIONS "; } 1; </code> ==== CLient side ==== FIXME -> TODO X2Go client can access a broker module using one of two broker methods. Via HTTP(S) or SSH. HTTP(S) broker is usually CGI script, which can look like: <code> #!/usr/bin/perl use strict; use CGI; use CGI::Carp qw(fatalsToBrowser); use lib "/usr/lib/x2go"; use x2gobroker; my $cgi = new CGI; my @formValues = $cgi->param(); print $cgi->header(-type =>'text/html', -expires =>'+1h'), $cgi->start_html( -title =>'X2Go Broker', -author =>'team(a)obviously-nice.de', -base =>'true', -meta =>{'keywords' =>'x2go', 'description'=>'X2Go Broker'}); if (!checkAccess($cgi->param('user'), $cgi->param('password'), $cgi->param('authid')) == 1) { printNoAccess(); print $cgi->end_html(); exit (0); } print $cgi->start_form(), $cgi->strong('Access granted'); if ($cgi->param('task') eq 'listsessions') { listSessions($cgi->param('user')); } if ($cgi->param('task') eq 'selectsession') { selectSession($cgi->param('user'), $cgi->param('sid')); } $cgi->hr(), $cgi->end_form(); print $cgi->end_html(); sub printNoAccess { print $cgi->start_form(), $cgi->hr(), $cgi->strong('Access denied'), $cgi->end_form(); } </code> SSH broker can be a simple Perl script, which can look like: <code> #!/usr/bin/perl use strict; use lib "/usr/lib/x2go"; use x2gobroker; use Getopt::Long; my $user=getlogin(); my $authid; my $task; my $sid; #you don't need to check password on ssh brocker. #But possible you steel want to check auth id #if (!checkAccess($user, $authid) == 1) #{ # printNoAccess(); # exit (0); #} print "Access granted\n"; GetOptions('task=s' => \$task, 'sid=s' => \$sid); if(! $task) { die "parameter --task is required"; } if ($task eq 'listsessions') { listSessions($user); } elsif ($task eq 'selectsession') { if(! $sid) { die "parameter --sid is required"; } selectSession($user, $sid); } else { die "task \"".$task."\" not implemented on broker\n"; } sub printNoAccess { die 'Access denied'; } </code> 2. How X2Go broker work 2.1. Authentication The X2Go client can use different methods of authentication. On HTTP(S) broker it could be username and password. On SSH broker a SSH key authentication can also be used. With both types of broker you can verify additional parameter "authid". It is a user defined string which is saved in file. Path to file can be specified as X2Go Client command line option "--auth-id". You can configure your broker not to check user data as it shown in example above. In such case function checkAccess should always return 1. In example of SSH-Broker this function is not called at all. The broker just print "Access granted" to let X2Go Client know, that authentication is successful. In some setups can make sense to give access to broker without authentication. For example in LAN if broker only serve as load balancer for X2Go Servers. 2.2. List of predefined X2Go sessions After successful authentication on broker, X2Go Client will request list of predefined X2Go Sessions. This list look just the same as session file of X2Go Client. The function, that send X2Go sessions to Client look like: <code> sub listSessions { print "START_USER_SESSIONS [ <session 1> ] option1=value1 .... optionN=valueN [ <session 2> ] option1=value1 .... optionN=valueN END_USER_SESSIONS "; } </code> The options are the same as in X2Go Client configuration file. There is only a difference in parameters "host" and "key". And there are two parameters which are not supported in configuration file "status" and "usebrokerpass". The "host" parameter it is not necessary a hostname of X2Go server. The actual address of a server will be provided after session selection. It can make sense in a case of load balancing. The best server will be chosen after selection and sent to client. The "key" parameter is also ignored. Key can be provided to client after selection of session too. However, you can set this parameter with some value to inform the Client, that passwordless authentication should be tried, for example: "key=will be provided later". Parameter "usebrokerpass" say, that a user password for this session should not be asked, but broker password should be used instead. It can be useful if the broker and X2Go Server using same authentication server and there is no need to ask the same password twice. It is not recommended to use such authentication with HTTP Broker without SSL encryption. Parameter "status" can be one of two values "S" or "R". It can be used to say X2Go Client that an instance (or instances) of this session already running or are suspended on server. X2Go Client will display the status on the Session button. 2.3. Selecting a session When predefined sessions are listed in X2Go Client, user can choose a session from sessions list. The id of chosen session will be sent to broker and broker send a connection data back to client. It is responsibility of function "selectSession": <code> sub selectSession { my ($user, $sid)=@_; if($sid eq "123456789") { print "SERVER:x2goserver.org:22\n"; } } </code> This function send a server address and SSH port for X2Go connection. If no other data are specified a new X2Go session will be created. Broker can also send to Client information, that suspended session should be resumed. In this case broker should also send a session data to Client: <code> sub selectSession { my ($user, $sid)=@_; if($sid eq "123456789") { print "SERVER:phoca:22\n"; print "SESSION_INFO:12542|ncryer-53-1348753256_stDstartxfce4_dp24|53|debian|S|2012-09-27T06:40:57|7db77095d8a782f479d509d96f2e3261|188.195.168.12|30004|30005|2012-09-27T06:41:28|ncryer|285|30006|\n"; } </code> Broker can get this data from session database or by executing "x2golistsessions $user" on X2Go server. If X2Go Client running in broker mode, it will not verify if there are existing sessions on X2Go server. It is a responsibility of X2Go Broker. Broker should also suspend session before providing session data to client if session is running. The broker can also provide a SSH Key to client: <code> sub selectSession { my ($user, $sid)=@_; if($sid eq "123456789") { print "SERVER:phoca:22\n"; print "-----BEGIN DSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED DEK-Info: AES-128-CBC,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX yX7XLwCszCLM1FCYpdIGmM98vuHVcpNlVUBVgNcTxE1XCCnPZPjUXiNnUZPk1lme XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX o1q7Q1YmH43qI18lifjUhGZUTYWKQSsj2Am9bnjqaveV2aMEWymC8J9aJOYLpVZG XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX G1DwWnSRgyJaxRm4Ik0/kh78ioUfkVerXaCf2OKCMyiZBWcsNfvQwDa9MBrZ4rYW XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX VR60OGB7dHy+7ozqkjzuX+uB04GIqPJwG797i26Bo4v7uhbALjMa5qsObqXIPM1S XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX== -----END DSA PRIVATE KEY-----"; } } </code> It can be useful in some cases. It is recommended to transfer such keys only over encrypted channels. It is also recommended to transfer only temporary keys, which should be removed from known_hosts after authorization on X2Go server. 3. Configuring X2Go client for connection to broker There are several command line parameters to configure X2Go Client for use with broker: --broker-name=<name> Name of broker to display in X2Go client. This parameter is optional --broker-url=<protocol>://[username@]<host>[:port]/path URL of broker. Protocol is "http", "https" or "ssh". You can specify an username in URL. In this case it will be pasted in authorization dialog of X2Go Client. Examples of URL: --broker-url=https://x2gobroker.org/cgi-bin/x2gobroker.cgi --broker-url=ssh://user@x2gobroker.org:22/usr/lib/x2go/x2gobroker.pl --broker-ssh-key=<path to key> Path to SSH key to use for authorization on broker. This parameter is valid only for SSH broker. --broker-autologin Use default SSH key or SSH agent for authorization on broker. This parameter is valid only for SSH broker. --broker-noauth Do not ask for user credentials for broker authorizations. This can be useful if you using HTTP(S) broker without authentication. Username will be sent to broker if it specified in broker URL. This option is valid only for HTTP(S) broker. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:advanced:x2gobroker:protocol
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 18:11 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2gobroker:protocol?rev=1364321… New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2gobroker:protocol Edit Summary: [JSON Broker Protocol] User : sunweaver @@ -10,6 +10,6 @@ The protocol's definition is explained on [[wiki:advanced:x2gobroker:plaintexprotocol|this separate page]]. ===== JSON Broker Protocol ===== - Unwritten future plans whisper about a JSON based broker protocol. Not ETA for such an implementation is available yet. + Unwritten future plans whisper about a JSON based broker protocol. No ETA for such an implementation is available, yet. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page added: wiki:advanced:x2gobroker:protocol
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 18:10 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: --- New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:x2gobroker:protocol Edit Summary: created User : sunweaver ====== X2Go Session Broker Protocols ====== At the time of writing there is only a plain/text X2Go Session Broker communication protocol implemented. ===== Plain Text Broker Protocol ===== The plain text protocol has been the first implementation of the X2Go Session Broker communication. The advantage of it is its simplicity. The disadvantage is that it is not very error tolerant. Neither can the plain text be used to transmit complex data structures. The protocol's definition is explained on [[wiki:advanced:x2gobroker:plaintexprotocol|this separate page]]. ===== JSON Broker Protocol ===== Unwritten future plans whisper about a JSON based broker protocol. Not ETA for such an implementation is available yet. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:59 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364320705 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: User : sunweaver @@ -60,9 +60,9 @@ - What is your plan for dealing with disappearing mentors? Please be as specific as possible. * All mentors have a professional interest that the project makes progress. * If a mentor disappears one of the other mentors will take over. - What steps will you take to encourage students to interact with your project's community before, during and after the program? - * Students already interacting with the project and those who have a personal interest in the project. + * FIXME (Morty!) Students already interacting with the project and those who have a personal interest in the project. - Are you a new organization who has a Googler or other organization to vouch for you? If so, please list their name(s) here. * NO - Are you an established or larger organization who would like to vouch for a new organization applying this year? If so, please list their name(s) here. * NO -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:58 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364320225 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: User : sunweaver @@ -50,11 +50,17 @@ * Moritz (Morty) Strübe * Heinz-Markus Graesing (Backup) * FIXME: if there are more mentors, update this field - What is your plan for dealing with disappearing students? Please be as specific as possible. - * To avoid students disappearing at all we will request a detailed time schedule and weekly reports. If possible we will try to schedule a chat with the mentor at least twice a week. The schedule will require the student to put some thought into whether he/her has sufficient time for the job. The weekly report tries to countermeasure that a student slowly disappears. We will also have a close look at the sutdent's backgound, whether he is capable of managing the task. For this the Department of Computer Science 4 will provide its experience in supervising students. + * To avoid students disappearing at all we will request a detailed time schedule and weekly reports. + * The schedule will require the student to put some thought into whether he/she has sufficient time for the job. + * The weekly report tries to countermeasure that a student slowly disappears. + * If possible we will try to schedule a chat with the mentor at least twice a week. + * There will be a personal (video chat) interview with one of the mentors before the student applies + * We will also have a close look at the student's backgound, whether she/he is capable of managing the task. For this the Department of Computer Science 4 will provide its experience in supervising students. - What is your plan for dealing with disappearing mentors? Please be as specific as possible. - * All mentors have a professional interest that the project makes progress. If a mentor disappears one of the other mentors will take over. + * All mentors have a professional interest that the project makes progress. + * If a mentor disappears one of the other mentors will take over. - What steps will you take to encourage students to interact with your project's community before, during and after the program? * Students already interacting with the project and those who have a personal interest in the project. - Are you a new organization who has a Googler or other organization to vouch for you? If so, please list their name(s) here. * NO -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:50 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364320199 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: User : sunweaver @@ -47,8 +47,9 @@ * Mike Gabriel - What criteria did you use to select the mentors? Please be as specific as possible. * Mike Gabriel * Moritz (Morty) Strübe + * Heinz-Markus Graesing (Backup) * FIXME: if there are more mentors, update this field - What is your plan for dealing with disappearing students? Please be as specific as possible. * To avoid students disappearing at all we will request a detailed time schedule and weekly reports. If possible we will try to schedule a chat with the mentor at least twice a week. The schedule will require the student to put some thought into whether he/her has sufficient time for the job. The weekly report tries to countermeasure that a student slowly disappears. We will also have a close look at the sutdent's backgound, whether he is capable of managing the task. For this the Department of Computer Science 4 will provide its experience in supervising students. - What is your plan for dealing with disappearing mentors? Please be as specific as possible. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:49 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364320103 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: User : sunweaver @@ -22,9 +22,9 @@ * Heinz-Markus Graesing (Freelancer & Trainer, also: Stadt Treuchtlingen) * and supported by * the Department of Computer Science 4 at the Friedrich-Alexander University, Erlangen-Nuremberg, Germany * the Department of Computer Science at Christian-Albrechts-University, Kiel, Germany - * Fleten.net DK (Kjetil Fleten, CEO) + * Fleten.net DK (Kjetil Fleten, CEO; Canonical Partner) * Lindix NL (Dick Kniep, CEO) - Why is your organization applying to participate in Google Summer of Code 2013? What do you hope to gain by participating? * Our current interest is getting X2Go more known internationally and getting more and more people involved * Some of the coding projects we offer to GSOC2013 students are features targetting for company setups @@ -45,9 +45,11 @@ * Channel #x2go on ''irc.freenode.net'' - Who will be your backup organization administrator? * Mike Gabriel - What criteria did you use to select the mentors? Please be as specific as possible. - * FIXME -> Who will be mentoring??? (see above) + * Mike Gabriel + * Moritz (Morty) Strübe + * FIXME: if there are more mentors, update this field - What is your plan for dealing with disappearing students? Please be as specific as possible. * To avoid students disappearing at all we will request a detailed time schedule and weekly reports. If possible we will try to schedule a chat with the mentor at least twice a week. The schedule will require the student to put some thought into whether he/her has sufficient time for the job. The weekly report tries to countermeasure that a student slowly disappears. We will also have a close look at the sutdent's backgound, whether he is capable of managing the task. For this the Department of Computer Science 4 will provide its experience in supervising students. - What is your plan for dealing with disappearing mentors? Please be as specific as possible. * All mentors have a professional interest that the project makes progress. If a mentor disappears one of the other mentors will take over. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:48 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364319738 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: User : sunweaver @@ -3,12 +3,16 @@ This document is work in progress and has to be finalized by March 21st, 2013. Please contribute! + + ===== Administrator ===== + + * Heinz-Markus Graesing (IRC: h1, Mail: heinz-m.graesing(a)obviously-nice.de) ===== Mentors ===== People available for mentoring are: - * Mike Gabriel (IRC: sunweaver, Mail: sunweaver(a)debian.org) - * Moritz Strübe (morty) + * Mike Gabriel (IRC: sunweaver, Mail: sunweaver(a)debian.org, Debian Developer) + * Moritz Strübe (IRC: morty, University of Erlangen-Nuremberg) ===== X2Go Application for GSOC2013 (Draft) ===== - Describe your organization. @@ -39,9 +43,9 @@ * [[x2go-dev(a)lists.berlios.de]] (Subscription form: [[http://lists.berlios.de/mailman/listinfo/x2go-dev]] - What is the main IRC channel for your organization? * Channel #x2go on ''irc.freenode.net'' - Who will be your backup organization administrator? - * FIXME + * Mike Gabriel - What criteria did you use to select the mentors? Please be as specific as possible. * FIXME -> Who will be mentoring??? (see above) - What is your plan for dealing with disappearing students? Please be as specific as possible. * To avoid students disappearing at all we will request a detailed time schedule and weekly reports. If possible we will try to schedule a chat with the mentor at least twice a week. The schedule will require the student to put some thought into whether he/her has sufficient time for the job. The weekly report tries to countermeasure that a student slowly disappears. We will also have a close look at the sutdent's backgound, whether he is capable of managing the task. For this the Department of Computer Science 4 will provide its experience in supervising students. @@ -49,10 +53,13 @@ * All mentors have a professional interest that the project makes progress. If a mentor disappears one of the other mentors will take over. - What steps will you take to encourage students to interact with your project's community before, during and after the program? * Students already interacting with the project and those who have a personal interest in the project. - Are you a new organization who has a Googler or other organization to vouch for you? If so, please list their name(s) here. - * FIXME + * NO - Are you an established or larger organization who would like to vouch for a new organization applying this year? If so, please list their name(s) here. * NO - What will you do to encourage that your accepted students stick with the project after Google Summer of Code concludes? - * FIXME + * First, we hope to provide a team space where people feel at home + * Then, we offer peole who are more deeply interested in X2Go to take over responsibility in the project + * As the project has two Debian Developers on board, more knowledge and community insights are available to newcomers + -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:gsoc2013-application
by wiki-admin＠x2go.org 26 Mar '13

26 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/26 17:42 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.35.16 Hostname : 16-35-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application?rev=1364226019 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013-application Edit Summary: [Mentors] User : sunweaver @@ -5,9 +5,9 @@ ===== Mentors ===== People available for mentoring are: - * Mike Gabriel (IRC: sunweaver) + * Mike Gabriel (IRC: sunweaver, Mail: sunweaver(a)debian.org) * Moritz Strübe (morty) ===== X2Go Application for GSOC2013 (Draft) ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

libjpeg-turbo.git - master (branch) updated: debian/1.1.90+svn704-1-131-g2ee4d48
by git-admin＠x2go.org 26 Mar '13

26 Mar '13

The branch, master has been updated via 2ee4d487895909b088527d359738386793a0c9e8 (commit) from 63bca8081f3208ece85076bb12e2d8a6ab79e7fa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2ee4d487895909b088527d359738386793a0c9e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 26 13:34:29 2013 +0100 Upload to X2Go archive for Debian. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 14 ++-- debian/control | 131 ++++++++++++++++++++++++++++++++++-- debian/docs | 1 + debian/libjpeg-turbo-progs.install | 10 --- debian/libjpeg-turbo-progs.postrm | 36 ---------- debian/libjpeg-turbo-progs.preinst | 55 --------------- debian/rules | 37 ++++++++++ debian/source.lintian-overrides | 4 -- 8 files changed, 169 insertions(+), 119 deletions(-) mode change 100644 => 100755 debian/libjpeg-turbo-progs.postrm mode change 100644 => 100755 debian/libjpeg-turbo-progs.preinst The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5db3af2..1771ca1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,10 @@ -libjpeg-turbo (1.2.90-2) unstable; urgency=low +libjpeg-turbo (1.2.90-1~x2go1) UNRELEASED; urgency=low - * /debian/control: - + Do not ship the libjpeg8 compat packages (libjpeg8-turbo, - libjpeg8-turbo-dev, libjpeg-turbo-progs). Only ship the - files needed for applications building against the native - TURBOjpeg ABI. - + The libturbojpeg1(-dev) package conflict with libjpeg-turbo8(-dev) - as found in Ubuntu. + * Upload to X2Go archive for Debian. - -- Mike Gabriel <sunweaver(a)debian.org> Sun, 24 Mar 2013 12:53:01 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 26 Mar 2013 13:33:58 +0100 -libjpeg-turbo (1.2.90-1) UNRELEASED; urgency=low +libjpeg-turbo (1.2.90-1) unstable; urgency=low [ Osamu Aoki ] * New upstream version. Closes: #612341 diff --git a/debian/control b/debian/control index a858c73..e3c1b83 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,6 @@ Replaces: libturbojpeg, Conflicts: libturbojpeg, - libjpeg-turbo8, Provides: libturbojpeg, Description: TurboJPEG runtime library - SIMD optimized @@ -49,11 +48,10 @@ Depends: libturbojpeg1 (= ${binary:Version}), libc-dev, ${misc:Depends}, -Replaces: - libturbojpeg-dev, Conflicts: libturbojpeg-dev, - libjpeg-turbo8-dev, +Replaces: + libturbojpeg-dev, Provides: libturbojpeg-dev, Description: Development files for the turbo JPEG library @@ -65,6 +63,131 @@ Description: Development files for the turbo JPEG library This package contains the static library, headers and documentation for the libjpegturbo.so.1 library. +Package: libjpeg8-turbo +Architecture: any +Multi-Arch: same +Section: libs +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Conflicts: + libjpeg-turbo8, +Replaces: + libjpeg8 (<< 9), + libjpeg-turbo8, +Provides: + libjpeg-turbo8, +Description: IJG JPEG compliant runtime library - SIMD optimized + This package provides a runtime library supporting the Independent JPEG + Group's standard for JPEG files. + . + However, this library is based on libjpeg-turbo and not on the Independent + JPEG Group's code base (as provided in the Debian package libjpeg8). + . + WARNING: This package contains a shared library which is a drop-in + replacement for libjpeg8. Replacing the standard libjpeg8 library + may have unexpected/unknown effects on certain applications. + . + The library provided in this package has better performance than + standard libjpeg by making use of SIMD and other optimizations. + +Package: libjpeg8-turbo-dev +Architecture: any +Section: libdevel +Multi-Arch: same +Depends: + libjpeg8-turbo (= ${binary:Version}), + libc-dev, + ${misc:Depends}, +Conflicts: + libjpeg62-dev, + libjpeg7-dev, + libjpeg-turbo8-dev, +Replaces: + libjpeg62-dev, + libjpeg7-dev, + libjpeg8-dev, + libjpeg-turbo8-dev, +Provides: + libjpeg-dev, + libjpeg8-dev, + libjpeg-turbo8-dev, +Description: Development files for the IJG JPEG library + This package provides a runtime library supporting the Independent JPEG + Group's standard for JPEG files. + . + However, this library is based on libjpeg-turbo and not on the Independent + JPEG Group's code base (as provided in the Debian package libjpeg8). + . + WARNING: This package contains a shared library which is a drop-in + replacement for libjpeg8. Replacing the standard libjpeg8 library + may have unexpected/unknown effects on certain applications. + . + The library provided in this package has better performance than + standard libjpeg by making use of SIMD and other optimizations. + . + This package contains the static library, headers and documentation. + . + Note for package maintainers: do not reference this package as build + dependency in other packages. Always build-depend on libjpeg-dev. + +Package: libjpeg8-turbo-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + libjpeg8-turbo (= ${binary:Version}), + ${misc:Depends}, +Conflicts: + libjpeg62-dbg, + libjpeg7-dbg, + libjpeg8-dbg, + libjpeg-turbo8-dbg, +Replaces: + libjpeg62-dbg, + libjpeg7-dbg, + libjpeg8-dbg, + libjpeg-turbo8-dbg, +Provides: + libjpeg-dbg, + libjpeg8-dbg, + libjpeg-turbo8-dbg, +Description: Debugging symbols for the libjpeg8-turbo library + This package provides a runtime library supporting the Independent JPEG + Group's standard for JPEG files. + . + However, this library is based on libjpeg-turbo and not on the Independent + JPEG Group's code base (as provided in the Debian package libjpeg8). + . + WARNING: This package contains a shared library which is a drop-in + replacement for libjpeg8. Replacing the standard libjpeg8 library + may have unexpected/unknown effects on certain applications. + . + The library provided in this package has better performance than + standard libjpeg by making use of SIMD and other optimizations. + . + This package contains the debugging symbols for libjpeg-turbo. + +Package: libjpeg-turbo-progs +Architecture: any +Depends: + ${shlibs:Depends}, + libjpeg8-turbo (= ${binary:Version}), + ${misc:Depends}, +Breaks: + libjpeg-progs, +Replaces: + libjpeg-progs, +Provides: + libjpeg-progs, +Description: Programs for manipulating JPEG files + This package contains programs for manipulating JPEG files. + . + This package is the libjpeg-turbo library's toolbox. Installing it + will replace the standard libjpeg's toolbox. + Package: libjpeg-turbo-test Architecture: any Priority: extra diff --git a/debian/docs b/debian/docs index e758a55..cea5a21 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,4 @@ +libjpeg.txt README README-turbo.txt structure.txt diff --git a/debian/libjpeg-turbo-progs.install b/debian/libjpeg-turbo-progs.install index 890ea31..b873669 100644 --- a/debian/libjpeg-turbo-progs.install +++ b/debian/libjpeg-turbo-progs.install @@ -2,19 +2,9 @@ usr/bin/cjpeg usr/bin/djpeg usr/bin/jpegtran usr/bin/rdjpgcom -<<<<<<< HEAD -usr/bin/tjbench -usr/bin/wrjpgcom -usr/share/man/man1/cjpeg.1 -usr/share/man/man1/djpeg.1 -usr/share/man/man1/jpegtran.1 -usr/share/man/man1/rdjpgcom.1 -usr/share/man/man1/wrjpgcom.1 -======= usr/bin/wrjpgcom # extra commands usr/bin/exifautotran usr/bin/jpegexiforient # skip installing #usr/bin/tjbench ->>>>>>> with-libjpeg8-turbo diff --git a/debian/libjpeg-turbo-progs.postrm b/debian/libjpeg-turbo-progs.postrm old mode 100644 new mode 100755 index 64ac512..ed9d0f2 --- a/debian/libjpeg-turbo-progs.postrm +++ b/debian/libjpeg-turbo-progs.postrm @@ -4,41 +4,6 @@ set -e case "$1" in -<<<<<<< HEAD - remove|abort-install|disappear) - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/bin/rdjpgcom - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/bin/wrjpgcom - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/bin/jpegtran - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/bin/cjpeg - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/bin/djpeg - - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/share/man/man1/wrjpgcom.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/share/man/man1/cjpeg.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/share/man/man1/djpeg.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/share/man/man1/rdjpgcom.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --remove /usr/share/man/man1/jpegtran.1.gz - - rm -rf /usr/bin/libjpeg-progs-divert /usr/share/man/libjpeg-progs-divert - ;; - - purge|upgrade|failed-upgrade|abort-upgrade) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -======= remove|abort-install|disappear) dpkg-divert --package libjpeg-turbo-progs --rename \ --remove /usr/bin/rdjpgcom @@ -71,7 +36,6 @@ case "$1" in echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; ->>>>>>> with-libjpeg8-turbo esac #DEBHELPER# diff --git a/debian/libjpeg-turbo-progs.preinst b/debian/libjpeg-turbo-progs.preinst old mode 100644 new mode 100755 index 7bed93c..c791117 --- a/debian/libjpeg-turbo-progs.preinst +++ b/debian/libjpeg-turbo-progs.preinst @@ -1,65 +1,11 @@ #!/bin/sh # preinst script for libjpeg-turbo-progs -<<<<<<< HEAD -======= # # Moving files from package libjpeg-progs out of the way... ->>>>>>> with-libjpeg8-turbo set -e case "$1" in -<<<<<<< HEAD - install) - if [ ! -d /usr/share/man/libjpeg-progs-divert ]; then - mkdir -p /usr/share/man/libjpeg-progs-divert - fi - - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/share/man/libjpeg-progs-divert/wrjpgcom.1.gz \ - --add /usr/share/man/man1/wrjpgcom.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/share/man/libjpeg-progs-divert/cjpeg.1.gz \ - --add /usr/share/man/man1/cjpeg.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/share/man/libjpeg-progs-divert/djpeg.1.gz \ - --add /usr/share/man/man1/djpeg.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/share/man/libjpeg-progs-divert/rdjpgcom.1.gz \ - --add /usr/share/man/man1/rdjpgcom.1.gz - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/share/man/libjpeg-progs-divert/jpegtran.1.gz \ - --add /usr/share/man/man1/jpegtran.1.gz - - if [ ! -d /usr/bin/libjpeg-progs-divert ]; then - mkdir -p /usr/bin/libjpeg-progs-divert - fi - - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/bin/libjpeg-progs-divert/rdjpgcom \ - --add /usr/bin/rdjpgcom - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/bin/libjpeg-progs-divert/wrjpgcom \ - --add /usr/bin/wrjpgcom - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/bin/libjpeg-progs-divert/jpegtranm \ - --add /usr/bin/jpegtran - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/bin/libjpeg-progs-divert/cjpeg \ - --add /usr/bin/cjpeg - dpkg-divert --package libjpeg-turbo-progs --rename \ - --divert /usr/bin/libjpeg-progs-divert/djpeg \ - --add /usr/bin/djpeg - ;; - - upgrade|abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -======= install) dpkg-divert --package libjpeg-turbo-progs --rename \ @@ -102,7 +48,6 @@ case "$1" in echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; ->>>>>>> with-libjpeg8-turbo esac #DEBHELPER# diff --git a/debian/rules b/debian/rules index ff18382..96cc3d5 100755 --- a/debian/rules +++ b/debian/rules @@ -31,9 +31,46 @@ endif %: dh $@ --with autoreconf +override_dh_auto_configure: + dh_auto_configure -v -- --with-jpeg8 CFLAGS="$(CFLAGS)" + +override_dh_auto_build: + dh_auto_build -v + $(MAKE) -C debian/extra CC=$(CC) CFLAGS="$(CPPFLAGS) $(CFLAGS) -Wall" LDFLAGS="$(LDFLAGS)" + +override_dh_install: + $(MAKE) -C debian/extra install prefix=/usr DESTDIR=$(CURDIR)/debian/tmp + : # fix jconfig.h + rm -f debian/tmp/usr/include/jconfig.h + mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH) + sed -e "s/#$undef\|define$ HAVE_$LOCALE\|\(STD\(DEF\|LIB$\)\)_H 1//g" \ + jconfig.h > debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/jconfig.h + + : # A very dirty hack, provide a symlink with libjpeg8-turbo that + : # supersedes any libjpeg.so.8.x.y version. That will trick SO_NAME symlinking + : # of ldconfig. + cd debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ && ln -s libjpeg.so.8.* libjpeg.so.8.99.0 + + dh_install + +override_dh_installchangelogs: + dh_installchangelogs -plibjpeg8-turbo-dev change.log + dh_installchangelogs -Nlibjpeg8-turbo-dev + +override_dh_strip: + dh_strip -plibjpeg8-turbo --dbg-package=libjpeg8-turbo-dbg + dh_strip -Nlibjpeg8-turbo libjpeg8-turbo-dbg + +override_dh_makeshlibs: + : # keep the original libjpeg symbol version + dh_makeshlibs -- -v8d + : # ... and mark libjpeg8-turbo only symbols with a different version + sed -i "$$(for i in $$(cat debian/libjpeg8-turbo-only.symbols); do echo "/^ $$i/s/8d$$/8d-1~/;"; done)" debian/libjpeg8-turbo/DEBIAN/symbols + override_dh_auto_clean: if [ -e Makefile ]; then $(MAKE) testclean; fi dh_auto_clean + $(MAKE) -C debian/extra clean rm -f simd/jsimdcfg.inc deb_source := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index eecc67e..c242a70 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,9 +1,5 @@ -<<<<<<< HEAD -libjpeg-turbo source: package-needs-versioned-debhelper-build-depends 9 -======= # relying on dh_makeshlibs does not work here, as makeshlibs would provide a # versioned dependency on libjpeg8 (>= 8d). # Thus, we hard-codedly depend on libc6 and libjpeg8-turbo for # libjpeg-turbo-progs. libjpeg-turbo source: package-depends-on-hardcoded-libc libjpeg-turbo-progs depends ->>>>>>> with-libjpeg8-turbo hooks/post-receive -- libjpeg-turbo.git (libjpeg-turbo packaging (X2Go repositories only)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libjpeg-turbo.git" (libjpeg-turbo packaging (X2Go repositories only)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2013