Skip to content

Commit

Permalink
Packaging for Ubuntu 19.10 (Eoan).
Browse files Browse the repository at this point in the history
  • Loading branch information
tarickb committed Mar 23, 2020
1 parent 6418f36 commit 84cd2aa
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 0 deletions.
56 changes: 56 additions & 0 deletions packaging/ubuntu-eoan/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
sasl-xoauth2 (0.8-1ubuntu1~eoan1~ppa1) eoan; urgency=low

* Package for Ubuntu 19.10.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Mon, 23 Mar 2020 11:52:00 -0700

sasl-xoauth2 (0.7-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Flesh out README.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Sun, 11 Aug 2019 21:54:00 -0700

sasl-xoauth2 (0.6-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Actually (?) fix broken 32-bit build.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Sat, 10 Aug 2019 19:22:00 -0700

sasl-xoauth2 (0.5-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Fix broken 32-bit build.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Sat, 10 Aug 2019 18:58:00 -0700

sasl-xoauth2 (0.4-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Add config file in /etc/sasl-xoauth2.conf.
* Store client secret in config file.
* Write failure logs to syslog instead of /tmp.
* Install library directly into SASL plugin directory.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Sat, 10 Aug 2019 10:43:00 -0700

sasl-xoauth2 (0.3-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Initial package for 0.3.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Fri, 09 Aug 2019 17:28:00 -0700

sasl-xoauth2 (0.2-1ubuntu1~bionic1~ppa2) bionic; urgency=low

* Fix symlinks.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Fri, 09 Aug 2019 17:13:00 -0700

sasl-xoauth2 (0.2-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Initial package for 0.2.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Fri, 09 Aug 2019 17:08:00 -0700

sasl-xoauth2 (0.1-1ubuntu1~bionic1~ppa1) bionic; urgency=low

* Initial package for 0.1.

-- Tarick Bedeir (Ubuntu Development) <[email protected]> Fri, 09 Aug 2019 16:48:00 -0700
1 change: 1 addition & 0 deletions packaging/ubuntu-eoan/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
17 changes: 17 additions & 0 deletions packaging/ubuntu-eoan/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Source: sasl-xoauth2
Section: utils
Priority: extra
Maintainer: Tarick Bedeir (Ubuntu Development) <[email protected]>
Build-Depends: debhelper (>= 11~),
cmake,
libcurl4-openssl-dev | libcurl4-nss-dev | libcurl4-gnutls-dev,
libjsoncpp-dev,
libsasl2-dev,
libstdc++6-4.6-dev | libstdc++-dev,
pkg-config
Standards-Version: 4.1.3

Package: sasl-xoauth2
Architecture: any
Depends: libsasl2-2, ${shlibs:Depends}, ${misc:Depends}
Description: SASL extension for XOAUTH2.
23 changes: 23 additions & 0 deletions packaging/ubuntu-eoan/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: sasl-xoauth2
Source: https://github.com/tarickb/sasl-xoauth2

Files: *
Copyright: 2019 Tarick Bedeir <[email protected]>
License: Apache-2.0
Copyright 2020 Google LLC
.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
http://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On debian systems, the complete text of the license can be found in the
/usr/share/common-licenses/Apache-2.0 file.
1 change: 1 addition & 0 deletions packaging/ubuntu-eoan/docs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
README.md
1 change: 1 addition & 0 deletions packaging/ubuntu-eoan/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
token-store-copy-elision.diff
14 changes: 14 additions & 0 deletions packaging/ubuntu-eoan/patches/token-store-copy-elision.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Don't use std::move() when building TokenStore as this prevents copy elision.
Index: sasl-xoauth2/src/token_store.cc
===================================================================
--- sasl-xoauth2.orig/src/token_store.cc
+++ sasl-xoauth2/src/token_store.cc
@@ -57,7 +57,7 @@ std::string GetTempSuffix() {
Log *log, const std::string &path) {
std::unique_ptr<TokenStore> store(new TokenStore(log, path));
if (store->Read() != SASL_OK) return {};
- return std::move(store);
+ return store;
}

int TokenStore::GetAccessToken(std::string *token) {
7 changes: 7 additions & 0 deletions packaging/ubuntu-eoan/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/make -f

%:
dh $@

override_dh_auto_configure:
dh_auto_configure -- -DEnableTests=OFF
1 change: 1 addition & 0 deletions packaging/ubuntu-eoan/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (quilt)

0 comments on commit 84cd2aa

Please sign in to comment.