From: Michael R Sweet <msweet@msweet.org>
Date: Tue, 17 Sep 2024 14:26:35 +0000 (-0400)
Subject: Save work.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ddaa6d687942e089db2a979ea86cdf785cd4438;p=thirdparty%2Fcups.git

Save work.
---

diff --git a/Dockerfile b/Dockerfile
index a8f2dfccba..93d37e1428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,25 +7,19 @@ FROM ubuntu:latest
 WORKDIR /workspaces/cups
 
 # Update package list and upgrade existing packages
-RUN apt-get update -y && apt-get upgrade -y
+RUN apt-get update -y && apt-get upgrade --fix-missing -y
 
 # Install required dependencies for CUPS
-RUN apt-get install -y \
-    autoconf \
-    build-essential \
-    libavahi-client-dev \
-    libgnutls28-dev \
-    libkrb5-dev \
-    libnss-mdns \
-    libpam-dev \
-    libsystemd-dev \
-    libusb-1.0-0-dev \
-    zlib1g-dev \
-    openssl \
+RUN apt-get install -y autoconf build-essential \
+    avahi-daemon  libavahi-client-dev \
+    libssl-dev libkrb5-dev libnss-mdns libpam-dev \
+    libsystemd-dev libusb-1.0-0-dev zlib1g-dev \
     sudo
 
 # Copy the current directory contents into the container's working directory
-COPY . .
+COPY . /root/cups
+WORKDIR /root/cups
+RUN ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var && make && make install
 
 # Expose port 631 for CUPS web interface
 EXPOSE 631
diff --git a/INSTALL.md b/INSTALL.md
index 452baadd66..c452f21209 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -34,17 +34,20 @@ however you'll miss out on many of the features provided by CUPS.
 On a stock Ubuntu install, the following command will install the required
 prerequisites:
 
-    sudo apt-get install autoconf build-essential libavahi-client-dev \
-         libgnutls28-dev libkrb5-dev libnss-mdns libpam-dev \
+    sudo apt-get install autoconf build-essential \
+         avahi-daemon libavahi-client-dev \
+         libssl-dev libkrb5-dev libnss-mdns libpam-dev \
          libsystemd-dev libusb-1.0-0-dev zlib1g-dev
 
 
 For Fedora you can install these packages:
 
-    sudo dnf install autoconf make automake gcc gcc-c++ krb5-devel avahi-devel \
-         gnutls-devel krb5-libs nss-mdns pam-devel \
+    sudo dnf install autoconf make automake gcc gcc-c++ \
+         avahi avahi-devel \
+         openssl-devel krb5-devel krb5-libs nss-mdns pam-devel \
          systemd-devel libusb1-devel zlib-devel
 
+
 Configuration
 -------------
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b530a67d30..e6edc386b0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   cups:
     build:
@@ -26,7 +24,7 @@ services:
         # build CUPS
         ./configure
         make
-        make install
+        #make install
 
         # Start the CUPS daemon for remote access
         /usr/sbin/cupsd \