ndev-stack 0.3.6__tar.gz → 0.3.7__tar.gz

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.6
+Version: 0.3.7
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/ndev/__init__.py

@@ -1,7 +1,7 @@
 """
 ndev: Fast, cross-platform PHP developer environment for Windows and Linux.
 """
-__version__ = "0.3.6"
+__version__ = "0.3.7"
 
 from . import common as common
 from .common.logger import logger as logger

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/ndev/linux/chroot/packages.py

@@ -37,6 +37,33 @@ def install_host_packages(packages: list[str], show_logs: bool = False):
                 logger.debug(f"zypper download failed: {e}")
 
             rpm_files = list(tmp_dir.rglob("*.rpm"))
+            # Auto-detect if any downloaded package is a metapackage requiring another -devel package
+            if rpm_files and shutil.which("rpm"):
+                downloaded_names = {rpm.stem.split("-")[0] for rpm in rpm_files}
+                secondary_pkgs = set()
+                for rpm in rpm_files:
+                    try:
+                        dep_res = subprocess.run(
+                            ["rpm", "-qp", "--requires", str(rpm)],
+                            capture_output=True,
+                            text=True,
+                            timeout=5
+                        )
+                        if dep_res.returncode == 0:
+                            for line in dep_res.stdout.splitlines():
+                                req = line.strip().split()[0]
+                                if req.endswith("-devel") and not any(req.startswith(name) for name in downloaded_names):
+                                    secondary_pkgs.add(req)
+                    except Exception:
+                        pass
+                if secondary_pkgs:
+                    try:
+                        cmd2 = ["zypper", "--pkg-cache-dir", str(tmp_dir), "download"] + list(secondary_pkgs)
+                        subprocess.run(cmd2, cwd=tmp_dir, capture_output=True, text=True)
+                    except Exception as e:
+                        logger.debug(f"zypper secondary download notice: {e}")
+                rpm_files = list(tmp_dir.rglob("*.rpm"))
+
             if rpm_files and shutil.which("rpm2cpio") and shutil.which("cpio"):
                 for rpm in rpm_files:
                     extract_dest = tmp_dir / rpm.stem

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/ndev/linux/php/builder.py

@@ -148,6 +148,15 @@ def build_php(version: str, archive_path: Path, show_logs: bool = False) -> Path
     env["ICU_CFLAGS"] = inc_dirs
     env["ICU_LIBS"] = f"{lib_dirs} -licui18n -licuuc -licudata -licuio"
 
+    env["OPENSSL_CFLAGS"] = inc_dirs
+    env["OPENSSL_LIBS"] = f"{lib_dirs} -lssl -lcrypto"
+
+    env["SQLITE3_CFLAGS"] = inc_dirs
+    env["SQLITE3_LIBS"] = f"{lib_dirs} -lsqlite3"
+
+    env["LIBXML_CFLAGS"] = f"-I/usr/local/include/libxml2 -I/usr/include/libxml2 {inc_dirs}"
+    env["LIBXML_LIBS"] = f"{lib_dirs} -lxml2"
+
     compat_flags = load_compat_args(version)
     if compat_flags:
         logger.info(f"Applying compatibility flags from args file for PHP {version}...")

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/ndev/linux/php/installer.py

@@ -21,12 +21,16 @@ def install_version(version_input: str, show_logs: bool = False) -> str:
             "libcurl-devel",
             "libxml2-devel",
             "libopenssl-devel",
+            "libopenssl-3-devel",
+            "libopenssl-1_1-devel",
             "libzip-devel",
             "libicu-devel",
             "libsodium-devel",
             "libpng16-devel",
             "libjpeg8-devel",
             "libwebp-devel",
+            "libwebpdecoder3",
+            "libgmpxx4",
             "freetype2-devel",
             "libbz2-devel",
             "gmp-devel",

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.6
+Version: 0.3.7
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.6"
+version = "0.3.7"
 description = "Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows"
 readme = "README.md"
 requires-python = ">=3.10"

{ndev_stack-0.3.6 → ndev_stack-0.3.7}/tests/test_opensuse_compat.py

@@ -310,5 +310,22 @@ i | openSUSE-Tumbleweed-Oss | mariadb               | 11.2.3-1.1            | 11
                 self.assertFalse(avail_none)
 
 
+class TestPhpDevelPackagesAndBuilder(unittest.TestCase):
+    def test_suse_devel_packages_include_openssl3(self):
+        with patch("ndev.linux.php.installer.is_suse", return_value=True):
+            with patch("ndev.linux.php.installer.resolve_version", return_value=("8.4.27", "f", "s", "u")):
+                with patch("ndev.linux.php.installer.download_php_source", return_value=Path("/tmp/fake.tar.xz")):
+                    with patch("ndev.linux.php.installer.install_host_packages") as mock_install_pkgs:
+                        with patch("ndev.linux.php.installer.build_php", return_value=Path("/tmp/prefix")):
+                            from ndev.linux.php.installer import install_version
+                            install_version("8.4")
+                            mock_install_pkgs.assert_called_once()
+                            pkgs = mock_install_pkgs.call_args[0][0]
+                            self.assertIn("libopenssl-3-devel", pkgs)
+                            self.assertIn("libopenssl-1_1-devel", pkgs)
+                            self.assertIn("libwebpdecoder3", pkgs)
+                            self.assertIn("libgmpxx4", pkgs)
+
+
 if __name__ == "__main__":
     unittest.main()