public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/lua-luaossl] rawhide: update to 20260910
Date: Fri, 18 Sep 2026 15:14:22 GMT	[thread overview]
Message-ID: <178974446263.1.3679494878638271980.rpms-lua-luaossl-37bbc2f85d3a@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/lua-luaossl
            Branch : rawhide
            Commit : 37bbc2f85d3a779bccde3811a0bf910239d58990
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-09-15T18:21:24-04:00
            Stats  : +7/-154 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/lua-luaossl/c/37bbc2f85d3a779bccde3811a0bf910239d58990?branch=rawhide

            Log:
            update to 20260910

This fixes compatibility with OpenSSL 4.0 and includes the Lua 5.5 patch.

---
diff --git a/.gitignore b/.gitignore
index d7632aa..3d34934 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /lua-luaossl-20190731.tar.gz
 /lua-luaossl-20200709.tar.gz
 /lua-luaossl-20250929.tar.gz
+/lua-luaossl-20260910.tar.gz

diff --git a/lua-luaossl-20250929-lua-5.5.patch b/lua-luaossl-20250929-lua-5.5.patch
deleted file mode 100644
index bd75614..0000000
--- a/lua-luaossl-20250929-lua-5.5.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -up luaossl-rel-20250929/GNUmakefile.lua55 luaossl-rel-20250929/GNUmakefile
---- luaossl-rel-20250929/GNUmakefile.lua55	2026-03-03 19:10:13.916890332 -0500
-+++ luaossl-rel-20250929/GNUmakefile	2026-03-03 19:20:48.388661649 -0500
-@@ -12,7 +12,7 @@ all: # default target
- #
- # G N U  M A K E  F U N C T I O N S
- #
--KNOWN_APIS = 5.1 5.2 5.3 5.4
-+KNOWN_APIS = 5.1 5.2 5.3 5.4 5.5
- 
- # template for invoking luapath script
- LUAPATH := $(d)/mk/luapath
-@@ -42,6 +42,9 @@ lua53cpath ?= $(libdir)/lua/5.3
- lua53path ?= $(datadir)/lua/5.3
- lua54cpath ?= $(libdir)/lua/5.4
- lua54path ?= $(datadir)/lua/5.4
-+lua55cpath ?= $(libdir)/lua/5.5
-+lua55path ?= $(datadir)/lua/5.5
-+
- 
- 
- AR ?= ar
-@@ -99,7 +102,7 @@ endif
- 
- # set LUA_APIS if empty or "?"
- ifeq ($(or $(strip $(LUA_APIS)),?),?)
--override LUA_APIS := $(call HAVE_API_FN,5.1) $(call HAVE_API_FN,5.2) $(call HAVE_API_FN,5.3) $(call HAVE_API_FN,5.4)
-+override LUA_APIS := $(call HAVE_API_FN,5.1) $(call HAVE_API_FN,5.2) $(call HAVE_API_FN,5.3) $(call HAVE_API_FN,5.4) $(call HAVE_API_FN,5.5)
- endif
- 
- define LUAXY_template
-@@ -135,6 +138,7 @@ $(eval $(call LUAXY_template,5.1))
- $(eval $(call LUAXY_template,5.2))
- $(eval $(call LUAXY_template,5.3))
- $(eval $(call LUAXY_template,5.4))
-+$(eval $(call LUAXY_template,5.5))
- 
- #
- # A U T O D E T E C T  C O M P I L A T I O N  F L A G S
-diff -up luaossl-rel-20250929/src/GNUmakefile.lua55 luaossl-rel-20250929/src/GNUmakefile
---- luaossl-rel-20250929/src/GNUmakefile.lua55	2026-03-03 19:22:41.325759333 -0500
-+++ luaossl-rel-20250929/src/GNUmakefile	2026-03-04 10:03:41.302991237 -0500
-@@ -41,6 +41,7 @@ $$(d)/$(1)/%.o: $$(d)/%.c $$(d)/config.h
- 
- ifneq ($(1), 5.3)
- ifneq ($(1), 5.4)
-+ifneq ($(1), 5.5)
- $$(d)/$(1)/compat53.o: $$(d)/../vendor/compat53/c-api/compat-5.3.c $$(d)/../vendor/compat53/c-api/compat-5.3.h $$(d)/config.h
- 	$$(MKDIR) -p $$(@D)
- 	$$(CC) $$(CFLAGS_$(d)) $$(ALL_LUA$(subst .,,$(1))_CPPFLAGS) $$(CPPFLAGS_$(d)) -c -o $$@ $$<
-@@ -50,6 +51,7 @@ $$(d)/$(1)/%.o: $$(d)/../vendor/compat53
- $$(d)/$(1)/openssl.so: $$(d)/$(1)/compat53.o
- endif
- endif
-+endif
- 
- .SECONDARY: liblua$(1)-openssl openssl$(1) openssl
- 
-@@ -61,14 +63,16 @@ $(eval $(call BUILD_$(d),5.1))
- $(eval $(call BUILD_$(d),5.2))
- $(eval $(call BUILD_$(d),5.3))
- $(eval $(call BUILD_$(d),5.4))
-+$(eval $(call BUILD_$(d),5.5))
- 
- ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" ""
--.SECONDARY: all all5.1 all5.2 all5.3 all5.4
-+.SECONDARY: all all5.1 all5.2 all5.3 all5.4 all5.5
- 
- all5.1: liblua5.1-openssl
- all5.2: liblua5.2-openssl
- all5.3: liblua5.3-openssl
- all5.4: liblua5.4-openssl
-+all5.5: liblua5.5-openssl
- all: $(foreach API,$(strip $(LUA_APIS)),all$(API))
- 
- endif
-@@ -157,23 +161,26 @@ $(eval $(call INSTALL_$(d),5.1,$$(lua51c
- $(eval $(call INSTALL_$(d),5.2,$$(lua52cpath),$$(lua52path)))
- $(eval $(call INSTALL_$(d),5.3,$$(lua53cpath),$$(lua53path)))
- $(eval $(call INSTALL_$(d),5.4,$$(lua54cpath),$$(lua54path)))
-+$(eval $(call INSTALL_$(d),5.5,$$(lua55cpath),$$(lua55path)))
- 
- ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" ""
- 
--.SECONDARY: install5.1 install5.2 install5.3 install5.4 install
-+.SECONDARY: install5.1 install5.2 install5.3 install5.4 install5.5 install
- 
- install5.1: liblua5.1-openssl-install
- install5.2: liblua5.2-openssl-install
- install5.3: liblua5.3-openssl-install
- install5.4: liblua5.4-openssl-install
-+install5.5: liblua5.5-openssl-install
- install: $(foreach API,$(strip $(LUA_APIS)),install$(API))
- 
--.PHONY: uninstall5.1 uninstall5.2 uninstall5.3 uninstall5.4 uninstall
-+.PHONY: uninstall5.1 uninstall5.2 uninstall5.3 uninstall5.4 uninstall5.5 uninstall
- 
- uninstall5.1: liblua5.1-openssl-uninstall
- uninstall5.2: liblua5.2-openssl-uninstall
- uninstall5.3: liblua5.3-openssl-uninstall
- uninstall5.4: liblua5.4-openssl-uninstall
-+uninstall5.5: liblua5.5-openssl-uninstall
- uninstall: $(foreach API,$(strip $(LUA_APIS)),uninstall$(API))
- 
- endif
-@@ -185,7 +192,7 @@ endif
- .PHONY: $(d)/clean $(d)/clean~ clean clean~
- 
- $(d)/clean:
--	$(RM) -fr $(@D)/config.h $(@D)/*.dSYM $(@D)/5.1 $(@D)/5.2 $(@D)/5.3 $(@D)/5.4
-+	$(RM) -fr $(@D)/config.h $(@D)/*.dSYM $(@D)/5.1 $(@D)/5.2 $(@D)/5.3 $(@D)/5.4 $(@D)/5.5
- 
- $(d)/clean~: $(d)/clean
- 	$(RM) -f $(@D)/*~
-@@ -209,16 +216,19 @@ $(d)/help:
- 	@echo "      all5.2 - build 5.2/openssl.so"
- 	@echo "      all5.3 - build 5.3/openssl.so"
- 	@echo "      all5.4 - build 5.4/openssl.so"
-+	@echo "      all5.5 - build 5.5/openssl.so"
- 	@echo "     install - install all API targets"
- 	@echo "  install5.1 - install openssl Lua 5.1 modules"
- 	@echo "  install5.2 - install openssl Lua 5.2 modules"
- 	@echo "  install5.3 - install openssl Lua 5.3 modules"
- 	@echo "  install5.4 - install openssl Lua 5.4 modules"
-+	@echo "  install5.5 - install openssl Lua 5.5 modules"
- 	@echo "   uninstall - uninstall all API targets"
- 	@echo "uninstall5.1 - uninstall openssl Lua 5.1 modules"
- 	@echo "uninstall5.2 - uninstall openssl Lua 5.2 modules"
- 	@echo "uninstall5.3 - uninstall openssl Lua 5.3 modules"
- 	@echo "uninstall5.4 - uninstall openssl Lua 5.4 modules"
-+	@echo "uninstall5.5 - uninstall openssl Lua 5.5 modules"
- 	@echo "       clean - rm binary targets, object files, debugging symbols, etc"
- 	@echo "      clean~ - clean + rm *~"
- 	@echo "        help - echo this help message"
-@@ -235,11 +245,14 @@ $(d)/help:
- 	@echo 'lua53cpath - install path for Lua 5.3 C modules ($(value lua53cpath))'
- 	@echo ' lua54path - install path for Lua 5.4 modules ($(value lua54path))'
- 	@echo 'lua54cpath - install path for Lua 5.4 C modules ($(value lua54cpath))'
-+	@echo ' lua55path - install path for Lua 5.5 modules ($(value lua55path))'
-+	@echo 'lua55cpath - install path for Lua 5.5 C modules ($(value lua55cpath))'
- 	@echo ""
- 	@echo 'LUA51_CPPFLAGS - cpp flags for Lua 5.1 headers ($(LUA51_CPPFLAGS))'
- 	@echo 'LUA52_CPPFLAGS - cpp flags for Lua 5.2 headers ($(LUA52_CPPFLAGS))'
- 	@echo 'LUA53_CPPFLAGS - cpp flags for Lua 5.3 headers ($(LUA53_CPPFLAGS))'
- 	@echo 'LUA54_CPPFLAGS - cpp flags for Lua 5.4 headers ($(LUA54_CPPFLAGS))'
-+	@echo 'LUA55_CPPFLAGS - cpp flags for Lua 5.5 headers ($(LUA55_CPPFLAGS))'
- 	@echo ""
- 	@echo "(NOTE: all the common GNU-style paths are supported, including"
- 	@echo "prefix, bindir, libdir, datadir, includedir, and DESTDIR.)"

diff --git a/lua-luaossl.spec b/lua-luaossl.spec
index 7c76b86..cd09384 100644
--- a/lua-luaossl.spec
+++ b/lua-luaossl.spec
@@ -5,14 +5,13 @@
 %global luapkgname luaossl
 
 Name:           lua-%{luapkgname}
-Version:        20250929
-Release:        4%{?dist}
+Version:        20260910
+Release:        1%{?dist}
 Summary:        Most comprehensive OpenSSL module in the Lua universe
 
 License:        MIT
 URL:            https://github.com/wahern/%{luapkgname}
 Source0:        https://github.com/wahern/%{luapkgname}/archive/rel-%{version}/%{name}-%{version}.tar.gz
-Patch0:         lua-luaossl-20250929-lua-5.5.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -53,7 +52,6 @@ for the Lua Programming Language
 
 %prep
 %setup -q -n %{luapkgname}-rel-%{version}
-%patch -P0 -p1 -b .lua55
 
 %build
 export CFLAGS="%{?optflags} -fPIC"
@@ -91,6 +89,9 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} install%{luacompat
 %{_pkgdocdir}
 
 %changelog
+* Tue Sep 15 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 20260910-1
+- update to 20260910
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20250929-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index b98c799..7bc3727 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lua-luaossl-20250929.tar.gz) = 66da276675b2fc372cfd7ab000143eee027d679dcb4f67a4a40bb413281c88ef277d6df740b46e2a038319b1eec04aee3c08880e6d7016cc94d5d232ecd9d77a
+SHA512 (lua-luaossl-20260910.tar.gz) = 9be4e0a968f62c62b7f86f99b482bcc42d6760eaf59729f56276b71a1bccfe6c6a87f81fd504353937b0c1e7246a1c5c3d6cf7efd657095cfdc8230824cf455d

                 reply	other threads:[~2026-09-18 15:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178974446263.1.3679494878638271980.rpms-lua-luaossl-37bbc2f85d3a@fedoraproject.org \
    --to=yselkowi@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox