[Pkg-privacy-commits] [libotr] 132/225: Imported Upstream version 2.0.2
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 12:45:12 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 fa3c71ab0046da824cd9ec230d5721571f90b0fe
Author: intrigeri <intrigeri at boum.org>
Date: Tue Feb 18 20:12:51 2014 +0000
Imported Upstream version 2.0.2
---
ChangeLog | 15 ++++++
NEWS | 3 ++
README | 2 +-
configure | 4 +-
configure.ac | 4 +-
packaging/debian/changelog | 18 -------
packaging/debian/compat | 1 -
packaging/debian/control | 55 --------------------
packaging/debian/copyright | 28 -----------
packaging/debian/docs | 2 -
packaging/debian/libotr1-dev.dirs | 3 --
packaging/debian/libotr1-dev.install | 5 --
packaging/debian/libotr1.dirs | 3 --
packaging/debian/libotr1.install | 3 --
packaging/debian/rules | 98 ------------------------------------
packaging/debian/watch | 6 ---
packaging/fedora/libotr.spec | 12 +++--
src/privkey.c | 2 +
src/version.h | 4 +-
19 files changed, 34 insertions(+), 234 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9b7fa75..e38b42f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-05-03
+
+ * README:
+ * configure.ac:
+ * packaging/fedora/libotr.spec:
+ * src/version.h: Change version to 2.0.2
+
+ * packaging/debian: Remove this directory, as Thibaut VARENE
+ <varenet at debian.org> is now responsible for the debian packages.
+
+2005-02-23
+
+ * src/privkey.c (otrl_privkey_hash_to_human): Avoid writing a
+ NUL one byte past the end of the buffer
+
2005-02-16
* README:
diff --git a/NEWS b/NEWS
index e547fad..0fd4081 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+3 May 2005:
+- Released 2.0.2
+
16 Feb 2005:
- Released 2.0.1
- Don't send encrypted messages to a buddy who has disconnected his
diff --git a/README b/README
index d9fadbb..0be6d4f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
Off-the-Record Messaging Library and Toolkit
- v2.0.1, 16 Feb 2005
+ v2.0.2, 3 May 2005
This is a library and toolkit which implements Off-the-Record (OTR) Messaging.
diff --git a/configure b/configure
index 5a85477..56d0838 100755
--- a/configure
+++ b/configure
@@ -1800,7 +1800,7 @@ fi
# Define the identity of the package.
PACKAGE=libotr
- VERSION=2.0.1
+ VERSION=2.0.2
cat >>confdefs.h <<_ACEOF
@@ -1926,7 +1926,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-LIBOTR_LIBTOOL_VERSION="1:1:0"
+LIBOTR_LIBTOOL_VERSION="1:2:0"
diff --git a/configure.ac b/configure.ac
index 0c9d0c6..16dc114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ dnl For a backwards-incompatible API change (e.g. changing data structures):
dnl Change the libotr package version from a.b.c to (a+1).0.0
dnl Change the libotr libtool version from x:y:z to (x+1):0:0
-AM_INIT_AUTOMAKE(libotr, 2.0.1)
-LIBOTR_LIBTOOL_VERSION="1:1:0"
+AM_INIT_AUTOMAKE(libotr, 2.0.2)
+LIBOTR_LIBTOOL_VERSION="1:2:0"
AC_SUBST(LIBOTR_LIBTOOL_VERSION)
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
deleted file mode 100644
index 1890d3c..0000000
--- a/packaging/debian/changelog
+++ /dev/null
@@ -1,18 +0,0 @@
-libotr1 (2.0.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- OTR Dev Team <otr at cypherpunks.ca> Wed, 16 Feb 2005 16:08:27 -0500
-
-libotr1 (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
-
-libotr1 (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 --git a/packaging/debian/compat b/packaging/debian/compat
deleted file mode 100644
index b8626c4..0000000
--- a/packaging/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/packaging/debian/control b/packaging/debian/control
deleted file mode 100644
index 3f08dc7..0000000
--- a/packaging/debian/control
+++ /dev/null
@@ -1,55 +0,0 @@
-Source: libotr1
-Section: libs
-Priority: optional
-Maintainer: OTR Dev Team <otr at cypherpunks.ca>
-Build-Depends: debhelper (>= 4.0.0), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0)
-Standards-Version: 3.6.1
-
-Package: libotr1
-Section: libs
-Architecture: any
-Depends: libgpg-error0 (>= 1.0), libgcrypt11 (>= 1.2.0)
-Replaces: libotr0
-Description: Off-the-Record Messaging Library and Toolkit
- 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: libotr1-dev
-Section: libdevel
-Architecture: any
-Depends: libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), libotr1 (= ${Source-Version})
-Provides: libotr-dev
-Conflicts: libotr-dev
-Replaces: libotr-dev, libotr0-dev
-Description: Off-the-Record Messaging Library and Toolkit
- 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.
-
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
deleted file mode 100644
index a554e28..0000000
--- a/packaging/debian/copyright
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by OTR Dev Team <otr at cypherpunks.ca> on
-Tue, 18 Jan 2005 16:23:41 -0500.
-
-It was downloaded from http://www.cypherpunks.ca/otr/
-
-Copyright (C) 2004-2005 by Nikita Borisov and Ian Goldberg
-
-Upstream Authors: OTR Dev Team <otr at cypherpunks.ca>
-
-License:
-
- 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 2 dated June, 1991.
-
- 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 package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/packaging/debian/docs b/packaging/debian/docs
deleted file mode 100644
index 055ff75..0000000
--- a/packaging/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-Protocol
diff --git a/packaging/debian/libotr1-dev.dirs b/packaging/debian/libotr1-dev.dirs
deleted file mode 100644
index 76d6480..0000000
--- a/packaging/debian/libotr1-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/aclocal
diff --git a/packaging/debian/libotr1-dev.install b/packaging/debian/libotr1-dev.install
deleted file mode 100644
index 589899f..0000000
--- a/packaging/debian/libotr1-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/lib*.a usr/lib
-debian/tmp/usr/lib/lib*.la usr/lib
-debian/tmp/usr/lib/lib*.so usr/lib
-debian/tmp/usr/share/aclocal/* usr/share/aclocal
diff --git a/packaging/debian/libotr1.dirs b/packaging/debian/libotr1.dirs
deleted file mode 100644
index d96c6d6..0000000
--- a/packaging/debian/libotr1.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/bin
-usr/share/man/man1
diff --git a/packaging/debian/libotr1.install b/packaging/debian/libotr1.install
deleted file mode 100644
index 193548c..0000000
--- a/packaging/debian/libotr1.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib
-debian/tmp/usr/bin/* usr/bin
-debian/tmp/usr/share/man/* usr/share/man
diff --git a/packaging/debian/rules b/packaging/debian/rules
deleted file mode 100755
index 64a5b87..0000000
--- a/packaging/debian/rules
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/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
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- ./configure --with-pic --prefix=/usr --mandir=/usr/share/man
- $(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.
- -$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# 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_install
-# 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
diff --git a/packaging/debian/watch b/packaging/debian/watch
deleted file mode 100644
index 5805163..0000000
--- a/packaging/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-version=2
-http://www.cypherpunks.ca/otr/ libotr-(.*)\.t(?:ar\.)?gz debian uupdate
diff --git a/packaging/fedora/libotr.spec b/packaging/fedora/libotr.spec
index 65e2834..80a3dd1 100644
--- a/packaging/fedora/libotr.spec
+++ b/packaging/fedora/libotr.spec
@@ -1,7 +1,7 @@
Summary: Off-The-Record Messaging libraray and toolkit
Name: libotr
%define majver 2
-%define minver 0.1
+%define minver 0.2
Version: %{majver}.%{minver}
%define debug_package %{nil}
%define ourrelease 1
@@ -28,13 +28,13 @@ Release: %{ourrelease}
Summary: the otr library and include files
Group: Applications/Internet
Release: %{ourrelease}
-Requires: libotr = 2.0.1
+Requires: libotr = 2.0.2
%description toolkit
Off-the-Record Messaging Library and Toolkit
- v2.0.1, 16 Feb 2005
+ v2.0.2, 3 May 2005
This is a library and toolkit which implements Off-the-Record (OTR) Messaging.
@@ -59,7 +59,7 @@ http://www.cypherpunks.ca/otr/
%description devel
Off-the-Record Messaging Library and Toolkit
- v2.0.1, 16 Feb 2005
+ v2.0.2, 3 May 2005
The devel package contains the libotr library and the include files
@@ -70,7 +70,7 @@ A dummy to satisfy rpm
%setup -q -n libotr-%{majver}.%{minver}
%build
-./configure --with-pic --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
+%configure --with-pic --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
%{__make} \
CFLAGS="${RPM_OPT_FLAGS}" \
all
@@ -102,6 +102,8 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Tue May 3 2005 Ian Goldberg <ian at cypherpunks.ca>
+- Bumped version number to 2.0.2
* Wed Feb 16 2005 Ian Goldberg <ian at cypherpunks.ca>
- Bumped version number to 2.0.1
* Tue Feb 8 2005 Ian Goldberg <ian at cypherpunks.ca>
diff --git a/src/privkey.c b/src/privkey.c
index b616018..828c90c 100644
--- a/src/privkey.c
+++ b/src/privkey.c
@@ -43,6 +43,8 @@ void otrl_privkey_hash_to_human(char human[45], unsigned char hash[20])
}
*(p++) = ' ';
}
+ /* Change that last ' ' to a '\0' */
+ --p;
*p = '\0';
}
diff --git a/src/version.h b/src/version.h
index f49f3e4..1096bbb 100644
--- a/src/version.h
+++ b/src/version.h
@@ -20,10 +20,10 @@
#ifndef __VERSION_H__
#define __VERSION_H__
-#define OTRL_VERSION "2.0.1"
+#define OTRL_VERSION "2.0.2"
#define OTRL_VERSION_MAJOR 2
#define OTRL_VERSION_MINOR 0
-#define OTRL_VERSION_SUB 1
+#define OTRL_VERSION_SUB 2
#endif
--
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