public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2020-06-26 10:31 Aisha Tammy
  0 siblings, 0 replies; 5+ messages in thread
From: Aisha Tammy @ 2020-06-26 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     288701ce317e0530f533163121dd67fcd8396635
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jun 26 10:19:48 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Jun 26 10:20:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=288701ce

net-libs/usockets: removed unneeded BDEPEND

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/files/usockets-Makefile.patch      | 17 +++++------------
 net-libs/usockets/metadata.xml                       | 18 +++++++++++-------
 ...sockets-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} | 20 +++++++++-----------
 net-libs/usockets/usockets-9999.ebuild               | 20 +++++++++-----------
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index a51f8b1..5be09ee 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index fa6e2ff..529ed74 100644
+index fa6e2ff..ca2603f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,14 @@
@@ -17,28 +17,21 @@ index fa6e2ff..529ed74 100644
  # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
  ifeq ($(WITH_OPENSSL),1)
  	override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,33 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
 -override LDFLAGS += uSockets.a
  
 -# By default we build the uSockets.a static library
--default:
-+static:
+ default:
  	rm -f *.o
 -	$(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
 -	$(AR) rvs uSockets.a *.o
-+	$(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+	$(AR) rvs libusockets.a *.o
-+
-+dynamic:
-+	rm -f *.o
 +	$(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++	$(AR) rvs libusockets.a *.o
 +	$(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
 +
-+default: static dynamic
-+
 +install:
 +	# install the folders needed  (making sure that the exist)
 +	install -d "$(DESTDIR)$(libdir)" \
@@ -56,7 +49,7 @@ index fa6e2ff..529ed74 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -52,4 +77,5 @@ swift_examples:
  clean:
  	rm -f *.o
  	rm -f *.a

diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml
index 73dd576..a24f33a 100644
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>gentoo@aisha.cc</email>
-        <name>Aisha Tammy</name>
-    </maintainer>
-    <use>
-      <flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
-    </use>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
+	</use>
 </pkgmetadata>

diff --git a/net-libs/usockets/usockets-0.4.1.ebuild b/net-libs/usockets/usockets-0.4.1-r1.ebuild
similarity index 78%
rename from net-libs/usockets/usockets-0.4.1.ebuild
rename to net-libs/usockets/usockets-0.4.1-r1.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-0.4.1.ebuild
+++ b/net-libs/usockets/usockets-0.4.1-r1.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
 	)
 	libuv? ( dev-libs/libuv[static-libs?] )
 "
-BDEPEND="${DEPEND}"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
 
 src_compile() {
 	# the Makefile uses environment variables
-	emake -j1 \
-		  LIBusockets_VERSION=${PV} \
-		  WITH_OPENSSL=$(usex ssl 1 0) \
-		  WITH_LIBUV=$(usex libuv 1 0) \
-		  default
+	emake LIBusockets_VERSION=${PV} \
+	      WITH_OPENSSL=$(usex ssl 1 0) \
+	      WITH_LIBUV=$(usex libuv 1 0) \
+	      default
 }
 
 src_install() {
-	emake -j1 \
-		  libdir="/usr/$(get_libdir)" \
-		  prefix="/usr" DESTDIR="${D}" \
-		  LIBusockets_VERSION=${PV} \
-		  install
+	emake libdir="/usr/$(get_libdir)" \
+	      prefix="/usr" \
+		  DESTDIR="${D}" \
+	      LIBusockets_VERSION=${PV} \
+	      install
 	einstalldocs
 	if ! use static-libs; then
 		rm "${D}/usr/$(get_libdir)/libusockets.a" || die

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
 	)
 	libuv? ( dev-libs/libuv[static-libs?] )
 "
-BDEPEND="${DEPEND}"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
 
 src_compile() {
 	# the Makefile uses environment variables
-	emake -j1 \
-		  LIBusockets_VERSION=${PV} \
-		  WITH_OPENSSL=$(usex ssl 1 0) \
-		  WITH_LIBUV=$(usex libuv 1 0) \
-		  default
+	emake LIBusockets_VERSION=${PV} \
+	      WITH_OPENSSL=$(usex ssl 1 0) \
+	      WITH_LIBUV=$(usex libuv 1 0) \
+	      default
 }
 
 src_install() {
-	emake -j1 \
-		  libdir="/usr/$(get_libdir)" \
-		  prefix="/usr" DESTDIR="${D}" \
-		  LIBusockets_VERSION=${PV} \
-		  install
+	emake libdir="/usr/$(get_libdir)" \
+	      prefix="/usr" \
+		  DESTDIR="${D}" \
+	      LIBusockets_VERSION=${PV} \
+	      install
 	einstalldocs
 	if ! use static-libs; then
 		rm "${D}/usr/$(get_libdir)/libusockets.a" || die


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2020-07-29 12:44 Aisha Tammy
  0 siblings, 0 replies; 5+ messages in thread
From: Aisha Tammy @ 2020-07-29 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     76c4834856ed8b49748d7f2bcc844eb79d41b09e
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jul 29 12:37:17 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Wed Jul 29 12:44:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76c48348

net-libs/usockets: update to 0.5.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                      |  1 +
 net-libs/usockets/files/usockets-Makefile.patch | 12 +++---
 net-libs/usockets/usockets-0.5.0.ebuild         | 54 +++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 26023b0..57d722f 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7 SHA512 2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0
+DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056 SHA512 ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd

diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index 5be09ee..5a10570 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index fa6e2ff..ca2603f 100644
+index 7d33414..6f3e53a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,3 +1,14 @@
+@@ -1,3 +1,13 @@
 +DESTDIR ?=
 +
 +prefix ?=	"/usr/local"
@@ -13,11 +13,10 @@ index fa6e2ff..ca2603f 100644
 +# OpenBSD specific library version
 +LIBTARGET =	libusockets.so.$(LIBusockets_VERSION)
 +
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
  ifeq ($(WITH_OPENSSL),1)
  	override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +43,27 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
@@ -49,9 +48,10 @@ index fa6e2ff..ca2603f 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +77,5 @@ swift_examples:
+@@ -52,4 +76,6 @@ swift_examples:
  clean:
  	rm -f *.o
  	rm -f *.a
 +	rm -f *.so
  	rm -rf .certs
++

diff --git a/net-libs/usockets/usockets-0.5.0.ebuild b/net-libs/usockets/usockets-0.5.0.ebuild
new file mode 100644
index 0000000..07f6828
--- /dev/null
+++ b/net-libs/usockets/usockets-0.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+else
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/uSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl libressl static-libs"
+
+DEPEND="ssl? (
+		libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
+		!libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+	)
+	libuv? ( dev-libs/libuv[static-libs?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/usockets-Makefile.patch"
+)
+
+src_compile() {
+	# the Makefile uses environment variables
+	emake LIBusockets_VERSION=${PV} \
+	      WITH_OPENSSL=$(usex ssl 1 0) \
+	      WITH_LIBUV=$(usex libuv 1 0) \
+	      default
+}
+
+src_install() {
+	emake libdir="/usr/$(get_libdir)" \
+	      prefix="/usr" \
+		  DESTDIR="${D}" \
+	      LIBusockets_VERSION=${PV} \
+	      install
+	einstalldocs
+	if ! use static-libs; then
+		rm "${D}/usr/$(get_libdir)/libusockets.a" || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2021-02-14 22:20 Aisha Tammy
  0 siblings, 0 replies; 5+ messages in thread
From: Aisha Tammy @ 2021-02-14 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5b03312f2fe5d1121be27f0f9fb8fe1fa0fcfbf3
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Feb 14 22:17:34 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sun Feb 14 22:19:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b03312f

net-libs/usockets: version bump to 0.7.1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                         |   1 +
 .../usockets/files/usockets-0.7.1-Makefile.patch   | 124 +++++++++++++++++++++
 ...{usockets-9999.ebuild => usockets-0.7.1.ebuild} |   7 +-
 net-libs/usockets/usockets-9999.ebuild             |   7 +-
 4 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index ffe05544..8ef09f26 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab SHA512 047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e978555507dec9047e6497823a880ae7deed03
+DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32 SHA512 06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
new file mode 100644
index 00000000..4d3d2045
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -0,0 +1,124 @@
+diff --git a/Makefile b/Makefile
+index 9b54cac..c31e575 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,60 +1,59 @@
++DESTDIR ?=
++
++prefix ?=	/usr
++exec_prefix ?=	$(prefix)
++LIB ?=		lib
++libdir ?=	$(exec_prefix)/$(LIB)
++includedir ?=	$(exec_prefix)/include
++
++PKG_CONFIG ?=	pkg-config
++
++VERSION ?=	0.0
++LIBTARGET =	libusockets.so.$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS =	-Isrc
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed with time
+ ifeq ($(WITH_OPENSSL),1)
+-	override CFLAGS += -DLIBUS_USE_OPENSSL
+-	# With problems on macOS, make sure to pass needed LDFLAGS required to find these
+-	override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+-	# WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
+-	ifeq ($(WITH_WOLFSSL),1)
+-		# todo: change these
+-		override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+-		override LDFLAGS += -L/usr/local/lib -lwolfssl
+-	else
+-		override CFLAGS += -DLIBUS_NO_SSL
+-	endif
++COMMON_FLAGS +=	-DLIBUS_USE_OPENSSL
++LDFLAGS +=	-lssl -lcrypto -lstdc++
++REQUIRES +=	libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-	override CFLAGS += -DLIBUS_USE_LIBUV
+-	override LDFLAGS += -luv
++COMMON_FLAGS +=	-DLIBUS_USE_LIBUV
++REQUIRES +=	libuv
+ endif
+ 
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-	override CFLAGS += -DLIBUS_USE_GCD
+-	override LDFLAGS += -framework CoreFoundation
+-endif
++CFLAGS +=	-std=c11 $(COMMON_FLAGS)
++CXXFLAGS +=	-std=c++17 $(COMMON_FLAGS)
+ 
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-	override CFLAGS += -fsanitize=address -g
+-	override LDFLAGS += -fsanitize=address
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
+-
+-# By default we build the uSockets.a static library
+ default:
+-	rm -f *.o
+-	$(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
++	$(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
+-	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++	$(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ endif
+-	$(AR) rvs uSockets.a *.o
+-
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+-	for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done
+-
+-swift_examples:
+-	swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
++	$(AR) rvs libusockets.a *.o
++	$(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++	sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
++	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
++
++install:
++	install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
++	install -m 644 src/libusockets.h "$(DESTDIR)$(includedir)/"
++	install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
++	ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
++	install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
++	install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
+ 
+ clean:
+ 	rm -f *.o
+ 	rm -f *.a
++	rm -f *.so
+ 	rm -rf .certs
++	rm -f libusockets.pc
++
++.PHONY: default install clean
+diff --git a/libusockets.pc.in b/libusockets.pc.in
+new file mode 100644
+index 0000000..b818020
+--- /dev/null
++++ b/libusockets.pc.in
+@@ -0,0 +1,12 @@
++prefix=@PREFIX@
++libdir=${prefix}/@LIB@
++includedir=${prefix}/include
++
++Name: uSockets
++Version: @VERSION@
++Description: eventing, networking and crypto for async applications.
++URL: https://github.com/uNetworking/uSockets
++
++Cflags: -I${includedir}
++Libs: -L${libdir} -lusockets
++Requires.private: @REQUIRES@

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-0.7.1.ebuild
similarity index 80%
copy from net-libs/usockets/usockets-9999.ebuild
copy to net-libs/usockets/usockets-0.7.1.ebuild
index 37f78076..10ce0fdd 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-0.7.1.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
-	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uSockets-${COMMIT}"
+	S="${WORKDIR}/uSockets-${PV}"
 fi
 
 LICENSE="Apache-2.0"
@@ -29,7 +28,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
+	"${FILESDIR}/${PN}-0.7.1-Makefile.patch"
 )
 
 src_configure() {

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 37f78076..10ce0fdd 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
-	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uSockets-${COMMIT}"
+	S="${WORKDIR}/uSockets-${PV}"
 fi
 
 LICENSE="Apache-2.0"
@@ -29,7 +28,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
+	"${FILESDIR}/${PN}-0.7.1-Makefile.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2021-05-11 13:48 Aisha Tammy
  0 siblings, 0 replies; 5+ messages in thread
From: Aisha Tammy @ 2021-05-11 13:48 UTC (permalink / raw
  To: gentoo-commits

commit:     351a7a9324f55ed3633ca1a3350701b188d4dabb
Author:     Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Tue May 11 13:47:51 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue May 11 13:48:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=351a7a93

net-libs/usockets: rename pkgconfig file

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <floss <AT> bsd.ac>

 net-libs/usockets/files/usockets-0.7.1-Makefile.patch             | 8 ++++----
 ...7.1_p20210214-r1.ebuild => usockets-0.7.1_p20210214-r2.ebuild} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
index f1ed03b5a..2d3a47d29 100644
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -86,7 +86,7 @@ index 9b54cac..a610bcc 100644
 +	$(AR) rvs libusockets.a *.o
 +	$(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +	sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > usockets.pc
++	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
 +
 +install:
 +	install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..a610bcc 100644
 +	install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
 +	ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
 +	install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+	install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
++	install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
  
  clean:
  	rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..a610bcc 100644
 +	rm -f libusockets.pc
 +
 +.PHONY: default install clean
-diff --git a/usockets.pc.in b/usockets.pc.in
+diff --git a/libusockets.pc.in b/libusockets.pc.in
 new file mode 100644
 index 0000000..b818020
 --- /dev/null
-+++ b/usockets.pc.in
++++ b/libusockets.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@PREFIX@
 +libdir=${prefix}/@LIB@

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
similarity index 100%
rename from net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
rename to net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2024-04-30 23:54 Aisha Tammy
  0 siblings, 0 replies; 5+ messages in thread
From: Aisha Tammy @ 2024-04-30 23:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7c5af05fefeba5081e616ef27362d2f080f909c9
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Apr 30 23:54:25 2024 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Apr 30 23:54:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c5af05f

net-libs/usockets: update to 0.8.8

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                         |   1 +
 .../usockets/files/usockets-0.8.8-Makefile.patch   | 172 +++++++++++++++++++++
 .../files/usockets-0.8.8-hammer-test.patch         |  16 ++
 ...{usockets-9999.ebuild => usockets-0.8.8.ebuild} |  11 +-
 net-libs/usockets/usockets-9999.ebuild             |  11 +-
 5 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index ff0b57d33f..c4055eecc2 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.8.1_p20211023.tar.gz 66346 BLAKE2B 1833d1d3981fd5cf7f48794b183426341d7dd0b36654a528335c61a2495a59e54bad6f634ec14ccf8b33895091cc48306d7d7b90031888ba661a2db8019f30e9 SHA512 146c130731ac8f071f339e71c8cd45f319e837d333a36c6f578a2d7d9546267660ad0d3f82505d3f5d33b0494ec26b2d7b7eba3756d62ecc883b1afbf6c5bfb2
+DIST usockets-0.8.8.tar.gz 90860 BLAKE2B 9a0886cf9446e67d8026419b353472d68f74045346c9e92b7ebb4f626580e1150ec555e6b56fbfad217ef38cc3b2c9d6148743033d0e42839eca998294393935 SHA512 726b1665209d0006d6621352c12019bbab22bed75450c5ef1509b409d3c19c059caf94775439d3b910676fa2a4a790d490c3e25e5b8141423d88823642be7ac7

diff --git a/net-libs/usockets/files/usockets-0.8.8-Makefile.patch b/net-libs/usockets/files/usockets-0.8.8-Makefile.patch
new file mode 100644
index 0000000000..6fe86246e4
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.8-Makefile.patch
@@ -0,0 +1,172 @@
+diff --git a/Makefile b/Makefile
+index aa874b9..13f9b34 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,109 +1,90 @@
+-# By default we use LTO, but Windows does not support it
+-ifneq ($(WITH_LTO),0)
+-	override CFLAGS += -flto
+-endif
++VERSION ?=	0.0
+ 
+-# WITH_BORINGSSL=1 enables BoringSSL support, linked statically (preferred over OpenSSL)
+-# You need to call "make boringssl" before
+-ifeq ($(WITH_BORINGSSL),1)
+-	override CFLAGS += -Iboringssl/include -pthread -DLIBUS_USE_OPENSSL
+-	override LDFLAGS += -pthread boringssl/build/ssl/libssl.a boringssl/build/crypto/libcrypto.a -lstdc++
+-else
+-	# WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+-	# For now we need to link with C++ for OpenSSL support, but should be removed with time
+-	ifeq ($(WITH_OPENSSL),1)
+-		override CFLAGS += -DLIBUS_USE_OPENSSL
+-		# With problems on macOS, make sure to pass needed LDFLAGS required to find these
+-		override LDFLAGS += -lssl -lcrypto -lstdc++
+-	else
+-		# WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
+-		ifeq ($(WITH_WOLFSSL),1)
+-			# todo: change these
+-			override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+-			override LDFLAGS += -L/usr/local/lib -lwolfssl
+-		else
+-			override CFLAGS += -DLIBUS_NO_SSL
+-		endif
+-	endif
+-endif
++PREFIX ?=	/usr
++LIB ?=		lib
++LIBDIR ?=	$(PREFIX)/$(LIB)
++INCDIR ?=	$(PREFIX)/include
+ 
+-# WITH_IO_URING=1 builds with io_uring as event-loop and network implementation
+-ifeq ($(WITH_IO_URING),1)
+-	override CFLAGS += -DLIBUS_USE_IO_URING
+-	# override LDFLAGS += -l
++PKG_CONFIG ?=	pkg-config
++
++LIBTARGET =	libusockets.so
++LIBTARGETV =	$(LIBTARGET).$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS =	-fPIC -Isrc
++
++# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
++# For now we need to link with C++ for OpenSSL support, but should be removed with time
++ifeq ($(WITH_OPENSSL),1)
++COMMON_FLAGS +=	-DLIBUS_USE_OPENSSL
++REQUIRES +=	libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-	override CFLAGS += -DLIBUS_USE_LIBUV
+-	override LDFLAGS += -luv
+-endif
+-
+-# WITH_ASIO builds with boot asio event-loop
+-ifeq ($(WITH_ASIO),1)
+-	override CFLAGS += -DLIBUS_USE_ASIO
+-	override LDFLAGS += -lstdc++ -lpthread
+-	override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
++COMMON_FLAGS +=	-DLIBUS_USE_LIBUV
++REQUIRES +=	libuv
+ endif
+ 
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-	override CFLAGS += -DLIBUS_USE_GCD
+-	override LDFLAGS += -framework CoreFoundation
++# WITH_IO_URING=1 builds with io_uring as event-loop and network implementation
++ifeq ($(WITH_IO_URING),1)
++COMMON_FLAGS +=	-DLIBUS_USE_IO_URING
++REQUIRES +=	liburing
+ endif
+ 
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-	override CFLAGS += -fsanitize=address -g
+-	override LDFLAGS += -fsanitize=address
++# WITH_ASIO=1 builds with boost asio event-loop
++ifeq ($(WITH_ASIO),1)
++COMMON_FLAGS +=	-pthread -DLIBUS_USE_ASIO
+ endif
+ 
+ ifeq ($(WITH_QUIC),1)
+-	override CFLAGS += -DLIBUS_USE_QUIC -pthread -std=c11 -Isrc -Ilsquic/include
+-	override LDFLAGS += -pthread -lz -lm uSockets.a lsquic/src/liblsquic/liblsquic.a
+-else
+-	override CFLAGS += -std=c11 -Isrc
+-	override LDFLAGS += uSockets.a
++override CFLAGS += -DLIBUS_USE_QUIC -pthread -std=c11 -Isrc -Ilsquic/include
++override LDFLAGS += -pthread -lz -lm uSockets.a lsquic/src/liblsquic/liblsquic.a
+ endif
+ 
+-# Also link liburing for io_uring support
+-ifeq ($(WITH_IO_URING),1)
+-	override LDFLAGS += /usr/lib/liburing.a
+-endif
++CFLAGS +=	-std=c11 $(COMMON_FLAGS)
++CXXFLAGS +=	-std=c++17 $(COMMON_FLAGS)
++
+ 
+-# By default we build the uSockets.a static library
+ default:
+-	rm -f *.o
+-	$(CC) $(CFLAGS) -O3 -c src/*.c src/eventing/*.c src/crypto/*.c src/io_uring/*.c
+-# Also link in Boost Asio support
++	$(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_ASIO),1)
+-	$(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
++	$(CXX) $(CXXFLAGS) -c src/eventing/asio.cpp
+ endif
+-
+ # For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
+ ifeq ($(WITH_OPENSSL),1)
+-	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++	$(CXX) $(CXXFLAGS) -c src/crypto/*.cpp
+ endif
+ ifeq ($(WITH_BORINGSSL),1)
+ 	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
+ endif
+-# Create a static library (try windows, then unix)
+-	lib.exe /out:uSockets.a *.o || $(AR) rvs uSockets.a *.o
++	$(AR) rvs libusockets.a *.o
++	$(CXX) $(CXXFLAGS) -shared -o $(LIBTARGETV) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++	sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@REQUIRES@:$(REQUIRES):" \
++	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
+ 
+-# BoringSSL needs cmake and golang
+-.PHONY: boringssl
+-boringssl:
+-	cd boringssl && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j8
+ 
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+-	for f in examples/*.c; do $(CC) -O3 $(CFLAGS) -o $$(basename "$$f" ".c")$(EXEC_SUFFIX) "$$f" $(LDFLAGS); done
++install:
++	install -d "$(DESTDIR)$(LIBDIR)/pkgconfig" "$(DESTDIR)$(INCDIR)"
++	install -m 644 src/libusockets.h "$(DESTDIR)$(INCDIR)/"
++	install -m 644 $(LIBTARGETV) "$(DESTDIR)$(LIBDIR)"
++	ln -sf $(LIBTARGETV) "$(DESTDIR)$(LIBDIR)/$(LIBTARGET)"
++	install -m 644 libusockets.a "$(DESTDIR)$(LIBDIR)/"
++	install -m 644 libusockets.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
++
++
++test:
++	rm -f localhost.pem localhost.crt
++	openssl req -x509 -out localhost.crt -keyout localhost.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=localhost' -extensions EXT -config localhost.conf
++	$(CXX) $(CXXFLAGS) examples/hammer_test.c libusockets.a -o hammer_test `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++	./hammer_test
+ 
+-swift_examples:
+-	swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
+ 
+ clean:
+ 	rm -f *.o
+ 	rm -f *.a
+-	rm -rf .certs
++	rm -f *.so
++	rm -f localhost.pem localhost.crt
++	rm -f libusockets.pc
++
++.PHONY: default install clean test

diff --git a/net-libs/usockets/files/usockets-0.8.8-hammer-test.patch b/net-libs/usockets/files/usockets-0.8.8-hammer-test.patch
new file mode 100644
index 0000000000..a23a8e8269
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.8-hammer-test.patch
@@ -0,0 +1,16 @@
+diff --git a/examples/hammer_test.c b/examples/hammer_test.c
+index 010e232..0837b8d 100644
+--- a/examples/hammer_test.c
++++ b/examples/hammer_test.c
+@@ -406,9 +406,8 @@ int main() {
+     // these are ignored for non-SSL
+     struct us_socket_context_options_t options;
+     memset(&options, 0, sizeof(struct us_socket_context_options_t));
+-    options.key_file_name = "/home/alexhultman/uWebSockets.js/misc/key.pem";
+-    options.cert_file_name = "/home/alexhultman/uWebSockets.js/misc/cert.pem";
+-    options.passphrase = "1234";
++    options.key_file_name = "localhost.pem";
++    options.cert_file_name = "localhost.crt";
+ 
+     http_context = us_create_socket_context(SSL, loop, sizeof(struct http_context), options);
+ 

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-0.8.8.ebuild
similarity index 77%
copy from net-libs/usockets/usockets-9999.ebuild
copy to net-libs/usockets/usockets-0.8.8.ebuild
index 58b0422a0b..07a9276ef2 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-0.8.8.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT="c2c1bbfa1644f1f6eb7fc9375650f41c5f9b7b06"
-	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uSockets-${COMMIT}"
+	S="${WORKDIR}/uSockets-${PV}"
 fi
 
 LICENSE="Apache-2.0"
@@ -25,17 +24,17 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	asio? ( dev-cpp/asio[ssl(+)?] )
+	asio? ( dev-cpp/asio[ssl(+)?]:= )
 	libuv? ( dev-libs/libuv )
 	ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1_p20211023-Makefile.patch"
+	"${FILESDIR}/${PN}-0.8.8-Makefile.patch"
 	"${FILESDIR}/${PN}-0.8.1_p20211023-pkg-config.patch"
 	"${FILESDIR}/${PN}-0.8.1_p20211023-gen-ssl-config.patch"
-	"${FILESDIR}/${PN}-0.8.1_p20211023-hammer-test.patch"
+	"${FILESDIR}/${PN}-0.8.8-hammer-test.patch"
 )
 
 src_configure() {

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 58b0422a0b..07a9276ef2 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT="c2c1bbfa1644f1f6eb7fc9375650f41c5f9b7b06"
-	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uSockets-${COMMIT}"
+	S="${WORKDIR}/uSockets-${PV}"
 fi
 
 LICENSE="Apache-2.0"
@@ -25,17 +24,17 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	asio? ( dev-cpp/asio[ssl(+)?] )
+	asio? ( dev-cpp/asio[ssl(+)?]:= )
 	libuv? ( dev-libs/libuv )
 	ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1_p20211023-Makefile.patch"
+	"${FILESDIR}/${PN}-0.8.8-Makefile.patch"
 	"${FILESDIR}/${PN}-0.8.1_p20211023-pkg-config.patch"
 	"${FILESDIR}/${PN}-0.8.1_p20211023-gen-ssl-config.patch"
-	"${FILESDIR}/${PN}-0.8.1_p20211023-hammer-test.patch"
+	"${FILESDIR}/${PN}-0.8.8-hammer-test.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-30 23:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-29 12:44 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/ Aisha Tammy
  -- strict thread matches above, loose matches on Subject: below --
2024-04-30 23:54 Aisha Tammy
2021-05-11 13:48 Aisha Tammy
2021-02-14 22:20 Aisha Tammy
2020-06-26 10:31 Aisha Tammy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox