[Pkg-privacy-commits] [libotr] 153/225: Imported Debian patch 4.0.0~rc1-1

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 12:45:21 UTC 2015


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit 8696d8bfabc81370431e9e79277f1215883f9fa2
Merge: d73497f 68df321
Author: Thibaut VARENE <varenet at debian.org>
Date:   Fri Aug 24 17:14:22 2012 +0200

    Imported Debian patch 4.0.0~rc1-1

 AUTHORS                                            |     3 +-
 COPYING                                            |     4 +-
 COPYING.LIB                                        |     4 +-
 ChangeLog                                          |   160 +-
 Makefile.am                                        |     2 +-
 Makefile.in                                        |   419 +-
 NEWS                                               |    16 +
 Protocol-v2.html => Protocol-v3.html               |   350 +-
 README                                             |    73 +-
 UPGRADING                                          |   720 +-
 aclocal.m4                                         | 13244 +++++-----
 config.guess                                       |   191 +-
 config.h.in                                        |     7 +
 config.sub                                         |   210 +-
 configure                                          | 25715 +++++++------------
 configure.ac                                       |   146 +-
 debian/changelog                                   |     7 +-
 debian/control                                     |    23 +-
 debian/docs                                        |     2 +-
 ...libotr2-bin.copyright => libotr3-bin.copyright} |     0
 .../{libotr2-bin.install => libotr3-bin.install}   |     0
 ...libotr2-dev.copyright => libotr3-dev.copyright} |     0
 debian/{libotr2-dev.dirs => libotr3-dev.dirs}      |     0
 .../{libotr2-dev.install => libotr3-dev.install}   |     0
 debian/patches/disable_otr_v1.patch                |    39 -
 debian/patches/series                              |     1 -
 debian/rules                                       |    14 +-
 depcomp                                            |   172 +-
 install-sh                                         |   517 +-
 libotr.m4                                          |     2 +-
 libotr.pc.in                                       |     2 +-
 ltmain.sh                                          | 13164 +++++-----
 missing                                            |   104 +-
 packaging/CVS/Entries                              |     1 -
 packaging/CVS/Repository                           |     1 -
 packaging/CVS/Root                                 |     1 -
 packaging/fedora/CVS/Entries                       |     2 -
 packaging/fedora/CVS/Repository                    |     1 -
 packaging/fedora/CVS/Root                          |     1 -
 packaging/fedora/libotr.spec                       |    13 +-
 src/Makefile.am                                    |     5 +-
 src/Makefile.in                                    |   301 +-
 src/auth.c                                         |   235 +-
 src/auth.h                                         |    33 +-
 src/b64.c                                          |    58 +-
 src/b64.h                                          |     5 +-
 src/context.c                                      |   312 +-
 src/context.h                                      |   126 +-
 src/context_priv.c                                 |    95 +
 src/context_priv.h                                 |    94 +
 src/dh.c                                           |    22 +-
 src/dh.h                                           |    10 +-
 src/instag.c                                       |   261 +
 src/instag.h                                       |    89 +
 src/mem.c                                          |     7 +-
 src/mem.h                                          |     5 +-
 src/message.c                                      |  1740 +-
 src/message.h                                      |   276 +-
 src/privkey-t.h                                    |    15 +-
 src/privkey.c                                      |   311 +-
 src/privkey.h                                      |    50 +-
 src/proto.c                                        |   599 +-
 src/proto.h                                        |    61 +-
 src/serial.h                                       |    30 +-
 src/sm.c                                           |   184 +-
 src/sm.h                                           |     5 +-
 src/tlv.c                                          |     5 +-
 src/tlv.h                                          |    14 +-
 src/userstate.c                                    |    10 +-
 src/userstate.h                                    |     8 +-
 src/version.h                                      |    13 +-
 toolkit/Makefile.in                                |   398 +-
 toolkit/aes.c                                      |   484 +-
 toolkit/ctrmode.c                                  |     4 +-
 toolkit/ctrmode.h                                  |     4 +-
 toolkit/otr_mackey.c                               |     6 +-
 toolkit/otr_modify.c                               |     8 +-
 toolkit/otr_parse.c                                |    40 +-
 toolkit/otr_readforge.c                            |    10 +-
 toolkit/otr_remac.c                                |    50 +-
 toolkit/otr_sesskeys.c                             |     4 +-
 toolkit/otr_toolkit.1                              |    11 +-
 toolkit/parse.c                                    |   132 +-
 toolkit/parse.h                                    |    26 +-
 toolkit/readotr.c                                  |     4 +-
 toolkit/readotr.h                                  |     4 +-
 toolkit/sesskeys.c                                 |    10 +-
 toolkit/sesskeys.h                                 |     4 +-
 toolkit/sha1hmac.c                                 |     4 +-
 toolkit/sha1hmac.h                                 |     4 +-
 90 files changed, 30829 insertions(+), 30688 deletions(-)

diff --cc debian/changelog
index 0999152,0000000..549c31d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,107 -1,0 +1,106 @@@
- libotr (3.2.1-1+deb7u1) stable; urgency=medium
++libotr (4.0.0~rc1-1) experimental; urgency=low
 +
-   * Non-maintainer upload with maintainer's agreement.
-   * Disable insecure OTRv1 protocol (Closes: #725779)
++  * New upstream pre-release (Closes: #685664)
 +
-  -- intrigeri <intrigeri at debian.org>  Sun, 22 Dec 2013 11:35:06 +0100
++ -- Thibaut VARENE <varenet at debian.org>  Fri, 24 Aug 2012 17:14:22 +0200
 +
 +libotr (3.2.1-1) unstable; urgency=high
 +
 +  * Fix potential buffer overflow in base64 routines (Closes: #684121)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Tue, 07 Aug 2012 12:24:15 +0200
 +
 +libotr (3.2.0-4) unstable; urgency=low
 +
 +  * lintian cleanup:
 +    + remove dh_make template
 +    + switch to source format 3.0 quilt
 +    + fix missing copyright warning
 +    + fix debhelper build-depend versionning
 +    + add homepage field
 +
 + -- Thibaut VARENE <varenet at debian.org>  Mon, 26 Dec 2011 18:33:08 +0100
 +
 +libotr (3.2.0-3) unstable; urgency=low
 +
 +  * Ship libotr.pc (Closes: #590035)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Mon, 31 Oct 2011 20:44:01 +0100
 +
 +libotr (3.2.0-2.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Empty dependency_libs in libtool la file(s).
 +    http://wiki.debian.org/ReleaseGoals/LAFileRemoval Closes: #619674
 +
 + -- Andreas Metzler <ametzler at debian.org>  Sat, 18 Jun 2011 14:39:28 +0200
 +
 +libotr (3.2.0-2) unstable; urgency=low
 +
 +  * Fix outdated config.{sub,guess} (Closes: #529461)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Wed, 11 Nov 2009 16:47:13 +0100
 +
 +libotr (3.2.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Thibaut VARENE <varenet at debian.org>  Sun, 22 Jun 2008 22:48:01 +0200
 +
 +libotr (3.1.0-2) unstable; urgency=low
 +
 +  * Closes: #459458: -dev package now depends on libgcrypt11-dev
 +
 + -- Thibaut VARENE <varenet at debian.org>  Sun, 13 Jan 2008 18:42:33 +0100
 +
 +libotr (3.1.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Thibaut VARENE <varenet at debian.org>  Mon, 20 Aug 2007 21:24:29 +0200
 +
 +libotr (3.0.0+cvs20070515-1) unstable; urgency=low
 +
 +  * Upstream snapshot to work with pidgin-otr (Closes: #423722)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Tue, 15 May 2007 18:55:22 +0200
 +
 +libotr (3.0.0-2) unstable; urgency=low
 +
 +  * Fix typo: "malformed messahes" (Closes: #345400)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Mon,  2 Jan 2006 19:52:18 +0100
 +
 +libotr (3.0.0-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #337851)
 +  * Support for OTR protocol version 2
 +
 + -- Thibaut VARENE <varenet at debian.org>  Sat, 19 Nov 2005 00:08:41 +0100
 +
 +libotr (2.0.2-1) unstable; urgency=high
 +
 +  * New upstream release
 +  * Fixes a potential security issue (buffer overflow in src/privkey.c)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Mon, 16 May 2005 18:53:59 +0200
 +
 +libotr (2.0.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * First Debian upload (closes: #291261)
 +
 + -- Thibaut VARENE <varenet at debian.org>  Wed, 23 Feb 2005 20:20:06 +0100
 +
 +libotr (2.0.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- OTR Dev Team <otr at cypherpunks.ca>  Tue, 08 Feb 2005 15:00:13 -0500
 +
 +libotr (1.99.0-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- OTR Dev Team <otr at cypherpunks.ca>  Wed, 02 Feb 2005 09:37:01 -0500
 +
diff --cc debian/control
index ebc0c06,0000000..3cb97e2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,84 -1,0 +1,85 @@@
 +Source: libotr
 +Section: libs
 +Priority: optional
 +Maintainer: Thibaut VARENE <varenet at debian.org>
 +Build-Depends: debhelper (>= 7.0.0), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), autotools-dev
- Standards-Version: 3.9.2
++Standards-Version: 3.9.3
 +Homepage: http://www.cypherpunks.ca/otr/
 +
- Package: libotr2
++Package: libotr3
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: libotr2-bin (>= ${binary:Version})
- Replaces: libotr0
++Suggests: libotr3-bin (>= ${binary:Version})
++Conflicts: libotr2
++Replaces: libotr0, libotr2
 +Description: Off-the-Record Messaging library
 + Off-the-Record (OTR) Messaging Library and Toolkit
 + .
 + OTR allows you to have private conversations over IM by providing:
 +  - Encryption
 +    - No one else can read your instant messages.
 +  - Authentication
 +    - You are assured the correspondent is who you think it is.
 +  - Deniability
 +    - The messages you send do _not_ have digital signatures that are
 +      checkable by a third party.  Anyone can forge messages after a
 +      conversation to make them look like they came from you.  However,
 +      _during_ a conversation, your correspondent is assured the messages
 +      he sees are authentic and unmodified.
 +  - Perfect forward secrecy
 +    - If you lose control of your private keys, no previous conversation
 +      is compromised.
 +
- Package: libotr2-bin
++Package: libotr3-bin
 +Section: misc
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Conflicts: libotr1-bin
- Replaces: libotr1-bin
++Conflicts: libotr1-bin, libotr2-bin
++Replaces: libotr1-bin, libotr2-bin
 +Description: toolkit for Off-the-Record Messaging library
 + Off-the-Record (OTR) Messaging Library toolkit
 + .
 + OTR allows you to have private conversations over IM by providing:
 +  - Encryption
 +    - No one else can read your instant messages.
 +  - Authentication
 +    - You are assured the correspondent is who you think it is.
 +  - Deniability
 +    - The messages you send do _not_ have digital signatures that are
 +      checkable by a third party.  Anyone can forge messages after a
 +      conversation to make them look like they came from you.  However,
 +      _during_ a conversation, your correspondent is assured the messages
 +      he sees are authentic and unmodified.
 +  - Perfect forward secrecy
 +    - If you lose control of your private keys, no previous conversation
 +      is compromised.
 +  .
 +  This package contains the program files for the OTR library.
 +
- Package: libotr2-dev
++Package: libotr3-dev
 +Section: libdevel
 +Architecture: any
- Depends: libotr2 (= ${binary:Version}), libgcrypt11-dev, ${shlibs:Depends}, ${misc:Depends}
++Depends: libotr3 (= ${binary:Version}), libgcrypt11-dev, ${shlibs:Depends}, ${misc:Depends}
 +Suggests: pkg-config
- Conflicts: libotr-dev, libotr1-dev
- Replaces: libotr-dev, libotr0-dev, libotr1-dev
++Conflicts: libotr-dev, libotr1-dev, libotr2-dev
++Replaces: libotr-dev, libotr0-dev, libotr1-dev, libotr2-dev
 +Description: Off-the-Record Messaging library development files
 + Off-the-Record (OTR) Messaging Library
 + .
 + OTR allows you to have private conversations over IM by providing:
 +  - Encryption
 +    - No one else can read your instant messages.
 +  - Authentication
 +    - You are assured the correspondent is who you think it is.
 +  - Deniability
 +    - The messages you send do _not_ have digital signatures that are
 +      checkable by a third party.  Anyone can forge messages after a
 +      conversation to make them look like they came from you.  However,
 +      _during_ a conversation, your correspondent is assured the messages
 +      he sees are authentic and unmodified.
 +  - Perfect forward secrecy
 +    - If you lose control of your private keys, no previous conversation
 +      is compromised.
 +  .
 +  This package contains the header files and static libraries needed to
 +  develop applications using libotr.
diff --cc debian/docs
index e69898b,0000000..6ed1f12
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,3 -1,0 +1,3 @@@
 +README
- Protocol-v2.html
++Protocol-v3.html
 +UPGRADING
diff --cc debian/libotr3-bin.copyright
index 7099346,0000000..7099346
mode 100644,000000..100644
--- a/debian/libotr3-bin.copyright
+++ b/debian/libotr3-bin.copyright
diff --cc debian/libotr3-bin.install
index f250696,0000000..f250696
mode 100644,000000..100644
--- a/debian/libotr3-bin.install
+++ b/debian/libotr3-bin.install
diff --cc debian/libotr3-dev.copyright
index e65ac3a,0000000..e65ac3a
mode 120000,000000..120000
--- a/debian/libotr3-dev.copyright
+++ b/debian/libotr3-dev.copyright
diff --cc debian/libotr3-dev.dirs
index c174187,0000000..c174187
mode 100644,000000..100644
--- a/debian/libotr3-dev.dirs
+++ b/debian/libotr3-dev.dirs
diff --cc debian/libotr3-dev.install
index f95fc4f,0000000..f95fc4f
mode 100644,000000..100644
--- a/debian/libotr3-dev.install
+++ b/debian/libotr3-dev.install
diff --cc debian/rules
index d3ec1a2,0000000..0196a35
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,108 -1,0 +1,98 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- 
- 
- 
- CFLAGS = -Wall -g
- 
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- 	CFLAGS += -O0
- else
- 	CFLAGS += -O2
- endif
- 
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
 +
 +	ln -sf /usr/share/misc/config.sub .
 +	ln -sf /usr/share/misc/config.guess .
 +	rm -f config.cache
 +
 +	# Add here commands to configure the package.
- 	./configure --with-pic --prefix=/usr --mandir=/usr/share/man
++	./configure --with-pic --prefix=/usr --mandir=/usr/share/man \
++	$(shell dpkg-buildflags --export=configure)
 +
 +	touch configure-stamp
 +
 +
 +build: build-arch build-indep
 +build-arch: build-stamp
 +build-indep: build-stamp
 +
 +build-stamp: configure-stamp 
 +	dh_testdir
 +
 +	# Add here commands to compile the package.
 +	$(MAKE)
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp configure-stamp
 +
 +	# Add here commands to clean up after the build process.
 +	[ ! -f Makefile ] || $(MAKE) distclean
 +
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_prep
 +	dh_installdirs
 +
 +	# Add here commands to install the package
 +	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 +	find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -exec \
 +		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
 +
 +	dh_install --list-missing
 +
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +# We have nothing to do by default.
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs ChangeLog
 +	dh_installdocs
 +#	dh_installexamples
 +#	dh_installmenu
 +#	dh_installdebconf	
 +#	dh_installlogrotate
 +#	dh_installemacsen
 +#	dh_installpam
 +#	dh_installmime
 +#	dh_installinit
 +#	dh_installcron
 +#	dh_installinfo
 +#	dh_installman
 +#	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +#	dh_perl
 +#	dh_python
 +	dh_makeshlibs -V
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git



More information about the Pkg-privacy-commits mailing list