The branch, build-main has been updated via 42b8b279e62e6e2f5a7455e30bb0a211763ee187 (commit) from e92b549c49833e3150d60e8773a6731fc49d1249 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .bzrignore => .gitignore | 0 configure.ac | 6 +-- debian/changelog | 5 +++ debian/compat | 1 + debian/control | 25 +++++++++++ debian/copyright | 30 +++++++++++++ debian/rules | 9 ++++ debian/source/format | 1 + debian/watch | 2 + src/Makefile.am | 44 ++++++++++---------- src/auth-check-path.c | 1 - ...{pam-freerdp-children.c => pam-x2go-children.c} | 0 ...{pam-freerdp-children.h => pam-x2go-children.h} | 0 src/{pam-freerdp.c => pam-x2go.c} | 0 src/{freerdp-auth-check.c => x2go-auth-check.c} | 0 tests/Makefile.am | 24 +++++------ tests/mock_guest.c | 4 +- tests/test-freerdp-wrapper.cc | 16 +++---- 18 files changed, 120 insertions(+), 48 deletions(-) copy .bzrignore => .gitignore (100%) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch rename src/{pam-freerdp-children.c => pam-x2go-children.c} (100%) rename src/{pam-freerdp-children.h => pam-x2go-children.h} (100%) rename src/{pam-freerdp.c => pam-x2go.c} (100%) rename src/{freerdp-auth-check.c => x2go-auth-check.c} (100%) The diff of changes is: diff --git a/.bzrignore b/.gitignore similarity index 100% copy from .bzrignore copy to .gitignore diff --git a/configure.ac b/configure.ac index 424c5f9..2f729c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libpam-freerdp], [1.0.1]) +AC_INIT([libpam-x2go], [1.0.1]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.11 -Wno-portability]) @@ -22,10 +22,10 @@ if test "x$have_pam" = "xno"; then fi ########################### -# FreeRDP +# X2Go ########################### -PKG_CHECK_MODULES(FREERDP, freerdp) +PKG_CHECK_MODULES(X2GO, x2go) ########################### # Local Install diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b9e0630 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +libpam-x2go (0.0.0.1-0~x2go1) UNRELEASED; urgency=low + + * Initial upstream release. Forked from libpam-freerdp. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 Nov 2012 01:10:25 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d3fe23c --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: libpam-x2go +Section: misc +Priority: extra +Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> +Uploaders: + Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Build-Depends: + debhelper (>= 9), + libgtest-dev, + libpam0g-dev, + pkg-config, +Standards-Version: 3.9.3 +Homepage: http://wiki.x2go.org +Vcs-Git: git://code.x2go.org/libpam-x2go.git + +Package: libpam-x2go +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + pyhoca-cli, +Description: PAM Module to auth against an X2Go server using PyHoca + Auth and session PAM module that uses PyHoca to authenticate against + an X2Go server as the remote host and user. Local account required. + Most useful with the pam-temp-account module. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..874cd91 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libpam-x2go +Source: http://code.x2go.org/gitweb?p=libpam-x2go.git;a=summary + +Files: * +Copyright: + 2012, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> + 2012, Canonical Ltd. +License: GPL-3 + +Files: debian/* +Copyright: + 2012, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de> +License: GPL-3 + +License: GPL-3 + This package 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; version 3 of the License. + . + This package 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 this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a438aed --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_install: + dh_install + find debian/libpam-x2go -name '*.a' -delete + find debian/libpam-x2go -name '*.la' -delete diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..63615b4 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/libpam-freerdp/+download .*/libpam-freerdp-(.+)\.tar\.gz diff --git a/src/Makefile.am b/src/Makefile.am index ed9087c..c99396f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,47 +1,47 @@ pamlibdir = $(PAMMODULEDIR) -pamlib_LTLIBRARIES = pam_freerdp.la +pamlib_LTLIBRARIES = pam_x2go.la -pam_freerdp_la_SOURCES = \ +pam_x2go_la_SOURCES = \ auth-check-path.c auth-check-path.h -pam_freerdp_la_LDFLAGS = \ +pam_x2go_la_LDFLAGS = \ -no-undefined \ -module \ -avoid-version \ $(COVERAGE_LDFLAGS) -pam_freerdp_la_CFLAGS = \ +pam_x2go_la_CFLAGS = \ -Wall -Werror \ - -DAUTH_CHECK="\"$(pkglibexecdir)/freerdp-auth-check\"" \ + -DAUTH_CHECK="\"$(pkglibexecdir)/x2go-auth-check\"" \ $(COVERAGE_CFLAGS) -pam_freerdp_la_LIBADD = \ - $(builddir)/libfreerdpcore.la +pam_x2go_la_LIBADD = \ + $(builddir)/libx2gocore.la noinst_LTLIBRARIES = \ - libfreerdpcore.la + libx2gocore.la -libfreerdpcore_la_SOURCES = \ - pam-freerdp.c \ - pam-freerdp-children.c -libfreerdpcore_la_CFLAGS = \ +libx2gocore_la_SOURCES = \ + pam-x2go.c \ + pam-x2go-children.c +libx2gocore_la_CFLAGS = \ -Wall -Werror \ $(COVERAGE_CFLAGS) -libfreerdpcore_la_LIBADD = \ +libx2gocore_la_LIBADD = \ -lpam -libfreerdpcore_la_LDFLAGS = \ +libx2gocore_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) pkglibexec_PROGRAMS = \ - freerdp-auth-check + x2go-auth-check -freerdp_auth_check_SOURCES = \ - freerdp-auth-check.c -freerdp_auth_check_CFLAGS = \ - $(FREERDP_CFLAGS) \ +x2go_auth_check_SOURCES = \ + x2go-auth-check.c +x2go_auth_check_CFLAGS = \ + $(x2go_CFLAGS) \ $(COVERAGE_CFLAGS) -freerdp_auth_check_LDADD = \ - $(FREERDP_LIBS) -freerdp_auth_check_LDFLAGS = \ +x2go_auth_check_LDADD = \ + $(x2go_LIBS) +x2go_auth_check_LDFLAGS = \ $(COVERAGE_LDFLAGS) diff --git a/src/auth-check-path.c b/src/auth-check-path.c index db311ea..4ba7de6 100644 --- a/src/auth-check-path.c +++ b/src/auth-check-path.c @@ -1,3 +1,2 @@ - const char * auth_check_path = AUTH_CHECK; diff --git a/src/pam-freerdp-children.c b/src/pam-x2go-children.c similarity index 100% rename from src/pam-freerdp-children.c rename to src/pam-x2go-children.c diff --git a/src/pam-freerdp-children.h b/src/pam-x2go-children.h similarity index 100% rename from src/pam-freerdp-children.h rename to src/pam-x2go-children.h diff --git a/src/pam-freerdp.c b/src/pam-x2go.c similarity index 100% rename from src/pam-freerdp.c rename to src/pam-x2go.c diff --git a/src/freerdp-auth-check.c b/src/x2go-auth-check.c similarity index 100% rename from src/freerdp-auth-check.c rename to src/x2go-auth-check.c diff --git a/tests/Makefile.am b/tests/Makefile.am index c257ac9..4ffa963 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,10 +3,10 @@ DISTCLEANFILES = EXTRA_DIST = TESTS = \ - test-freerdpclient-wrapper + test-pyhoca-wrapper check_PROGRAMS = \ - test-freerdp-auth \ + test-x2go-auth \ $(TESTS) AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ @@ -39,29 +39,29 @@ libgtest_a_CXXFLAGS = \ # Wrapper ########################## -test_freerdp_wrapper: test-freerdp-auth +test_x2go_wrapper: test-x2go-auth -test_freerdpclient_wrapper_SOURCES = \ +test_pyhoca_wrapper_SOURCES = \ mock_pam.c mock_pam.h \ mock_guest.c mock_guest.h \ - test-freerdp-wrapper.cc + test-x2go-wrapper.cc -test_freerdpclient_wrapper_LDADD = \ - $(top_builddir)/src/libfreerdpcore.la \ +test_pyhoca_wrapper_LDADD = \ + $(top_builddir)/src/libx2gocore.la \ libgtest.a -test_freerdpclient_wrapper_CXXFLAGS = \ +test_pyhoca_wrapper_CXXFLAGS = \ $(AM_CXXFLAGS) \ - -DAUTH_CHECK="\"$(abs_builddir)/test-freerdp-auth\"" \ + -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \ -I${top_srcdir}/src -test_freerdpclient_wrapper_LDFLAGS = \ +test_pyhoca_wrapper_LDFLAGS = \ -pthread ########################## # Auth tool ########################## -test_freerdp_auth_SOURCES = \ - test-freerdp-auth.c +test_x2go_auth_SOURCES = \ + test-x2go-auth.c diff --git a/tests/mock_guest.c b/tests/mock_guest.c index 8bf2c3a..3327da0 100644 --- a/tests/mock_guest.c +++ b/tests/mock_guest.c @@ -68,7 +68,7 @@ void _exit (int exitcode) #define BUFFER_SIZE 512 -/*Borrowed this code form socket-sucker.c in lightdm-remote-session-freerdp*/ +/*Borrowed this code form socket-sucker.c in lightdm-remote-session-x2go*/ int socket_sucker () { @@ -85,7 +85,7 @@ socket_sucker () serv_addr.sun_family = AF_UNIX; - int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp-socket"); + int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket"); if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) { return -1; } diff --git a/tests/test-freerdp-wrapper.cc b/tests/test-freerdp-wrapper.cc index 147682d..67aca58 100644 --- a/tests/test-freerdp-wrapper.cc +++ b/tests/test-freerdp-wrapper.cc @@ -12,7 +12,7 @@ extern "C" { #include "mock_pam.h" #include "mock_guest.h" - int freerdpclient_wrapper (int argc, char * argv[]); + int x2goclient_wrapper (int argc, char * argv[]); const char * auth_check_path = AUTH_CHECK; @@ -21,17 +21,17 @@ const char * auth_check_path = AUTH_CHECK; namespace { // The fixture for testing class Foo. - class FreerdpclientWrapperTest : public ::testing::Test { + class PyhocaWrapperTest : public ::testing::Test { protected: // You can remove any or all of the following functions if its body // is empty. - FreerdpclientWrapperTest() { + PyhocaWrapperTest() { // You can do set-up work for each test here. setenv("HOME", "/tmp", 1 /* overwrite */); } - virtual ~FreerdpclientWrapperTest() { + virtual ~PyhocaWrapperTest() { // You can do clean-up work that doesn't throw exceptions here. } @@ -41,24 +41,24 @@ namespace { virtual void SetUp() { // Code here will be called immediately after the constructor (right // before each test). - unlink("/tmp/.freerdp-socket"); + unlink("/tmp/.x2go-socket"); } virtual void TearDown() { // Code here will be called immediately after each test (right // before the destructor). - unlink("/tmp/.freerdp-socket"); + unlink("/tmp/.x2go-socket"); } // Objects declared here can be used by all tests in the test case for Foo. }; - TEST_F(FreerdpclientWrapperTest, canLinkTheWholeGang) { + TEST_F(PyhocaWrapperTest, canLinkTheWholeGang) { EXPECT_EQ (1, 1); // right, that's trivial, but that means // that I got all of the wrapper and pam to link there } - TEST_F(FreerdpclientWrapperTest, canCallPamOpenSession) { + TEST_F(PyhocaWrapperTest, canCallPamOpenSession) { const char *argv[] = { NULL }; pam_handle_t *pamh = pam_handle_new (); hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) 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 "libpam-x2go.git" (Remote login session via X2Go (PAM module)).