• Oct 7, 2015

    v6.0.7

    Merge branch '6.0.7'
    Conflicts:
    	.gitignore
    	Makefile.am
    	archived-changelog/3.3/ChangeLog
    	autogen.sh
    	configure.ac
    	debian/Makefile.am
    	debian/changelog
    	debian/control
    	debian/libzorp6.0-7.files
    	debian/libzorp6.0-dev.files
    	debian/rules
    	debian/zorp-modules.files
    	debian/zorp.docs
    	debian/zorp.files
    	debian/zorp.init
    	modules/ftp/Makefile.am
  • Aug 4, 2015

    v5.0.0

    Merge branch '5.0.0'
    Conflicts:
    	.gitignore
    	Makefile.am
    	autogen.sh
    	configure.ac
    	debian/Makefile.am
    	debian/changelog
    	debian/control
    	debian/libzorp5.0-0.files
    	debian/libzorp5.0-dev.files
    	debian/python-kzorp.files
    	debian/rules
    	debian/zorp-modules.files
    	debian/zorp.files
    	debian/zorp.init
    	modules/ftp/Makefile.am
  • Mar 27, 2014

    v3.9.8

    Merge branch '3.9.8'
    
  • Aug 6, 2013

    v3.9.7

    Merge branch '3.9.7'
    Conflicts:
    	Makefile.am
  • Aug 5, 2013

    v3.9.6

    Merge branch '3.9.6'
    Conflicts:
    	configure.in
    	lib/pycore.c
    	modules/http/Makefile.am
  • Mar 7, 2012

    v3.9.5

    Merge branch '3.9.5'
    * 3.9.5:
      Remove even more generated files from the repository.
      zorp-config.in: no longer necessary
      Added directory to make configure happy.
      debian: remove debian packaging
      gitignore: add more generated files to the ignore list
      changelog: move to archived-changelog
      autogen.sh: add as an easy way to build from the repo
      remove generated files
      .gitignore: add ignore file
      Initial import of zorp_3.9.5.tar.gz
    
    Conflicts:
    	Makefile.am
    	configure.in
    	modules/ftp/Makefile.am
  • Mar 5, 2012

    v3.9.3

    Merge branch '3.9.3'
    * 3.9.3:
      Removed all pre-related ifs from Makefiles and configure.in
      Removed some more upstream debianization
      compile_problems2
      compile_problems
      openssl_1.0.diff
      zorpconfig_man.diff
      Added directory to make configure happy.
      Changed zorp program install dir name to pkglibexec.
      Fixed passphrase handling of trusted CA private key.
      makefile: remove debian directory references
      debian: remove debian packaging
      gitignore: add more generated files to the ignore list
      changelog: move to archived-changelog
      autogen.sh: add as an easy way to build from the repo
      remove generated files
      .gitignore: add ignore file
      Initial import of zorp_3.9.3.tar.gz
    
    Conflicts:
    	Makefile.am
    	configure.in
  • Aug 24, 2011

    v3.9.2

    Merge branch '3.9.2'
    Conflicts:
    	Makefile.am
    	configure.in
    	modules/pop3/debian/Makefile.am
    	modules/smtp/debian/Makefile.am
    	pylib/Zorp/Resolver.py